diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-11-26 23:56:26 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-11-26 23:56:32 +0200 |
| commit | 34268ebe03133b799208da261dbdbf7c0fb40b93 (patch) | |
| tree | 355c58a6d9a8325ff1d395b6dadff2cec8013271 /wikimarkup.py | |
| parent | 67cd79c3c64d6dfe73ff5dd80ba51d0bf9267b04 (diff) | |
| download | wikitrans-34268ebe03133b799208da261dbdbf7c0fb40b93.tar.gz wikitrans-34268ebe03133b799208da261dbdbf7c0fb40b93.tar.bz2 | |
Fix HTML generation.
* wikins.py: New file (automatically generated.)
* build-aux/extrns.php: New file (generator for the above).
* wiki2html.py (HtmlWikiMarkup.image_kw, target): Remove
(wiki_ns_name,link,mktgt): New methods.
(str_link,str_tmpl): Rewrite using self.link.
* wiki2text.py, wikimarkup.py (__init__): Fix handling of multiple keywords.
Diffstat (limited to 'wikimarkup.py')
| -rw-r--r-- | wikimarkup.py | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/wikimarkup.py b/wikimarkup.py index e2a1cab..7a7125e 100644 --- a/wikimarkup.py +++ b/wikimarkup.py @@ -351,25 +351,26 @@ class WikiMarkup (BaseWikiMarkup): file = None text = None lang = 'en' - html_base = 'http://%(lang)s.wiktionary.org' - image_base = 'http://upload.wikimedia.org/wikipedia/commons/thumb/a/bf/' + html_base = 'http://%(lang)s.wiktionary.org/wiki' + image_base = 'http://upload.wikimedia.org/wikipedia/commons/thumb/a/bf' media_base = 'http://www.mediawiki.org/xml/export-0.3' def __init__(self, *args, **keywords): - if 'file' in keywords: - self.file = keywords['file'] - elif 'filename' in keywords: - self.file = open(keywords['filename']) - elif 'text' in keywords: - self.text = keywords['text'].split("\n") - elif 'lang' in keywords: - self.lang = keywords['lang'] - elif 'html_base' in keywords: - self.html_base = keywords['html_base'] - elif 'image_base' in keywords: - self.image_base = keywords['image_base'] - elif 'media_base' in keywords: - self.media_base = keywords['media_base'] + for kw in keywords: + if kw == 'file': + self.file = keywords[kw] + elif kw == 'filename': + self.file = open(keywords[kw]) + elif kw == 'text': + self.text = keywords[kw].split("\n") + elif kw == 'lang': + self.lang = keywords[kw] + elif kw == 'html_base': + self.html_base = keywords[kw] + elif kw == 'image_base': + self.image_base = keywords[kw] + elif kw == 'media_base': + self.media_base = keywords[kw] def __del__(self): if self.file: |