diff options
-rw-r--r-- | wiki2html.py | 5 | ||||
-rw-r--r-- | wikimarkup.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wiki2html.py b/wiki2html.py index 6fa0ae3..b87923b 100644 --- a/wiki2html.py +++ b/wiki2html.py @@ -64,7 +64,7 @@ class HtmlWikiMarkup (WikiMarkup): envel = [ "li", "li", "dd" ] def mktgt(self, tgt): - return self.html_base % { 'lang' : self.lang } + '/' + urllib.quote(tgt) + return self.html_base % { 'lang' : self.lang } + urllib.quote(tgt) def link(self, tok, env, istmpl): arg = self.fmtok(tok[1], env) @@ -84,8 +84,7 @@ class HtmlWikiMarkup (WikiMarkup): else: tgt = self.mktgt(tgt) elif not istmpl and qual in self.langtab: - tgt = self.html_base % { 'lang' : qual } + \ - '/' + urllib.quote(tgt) + tgt = self.html_base % { 'lang' : qual } + urllib.quote(tgt) if not text or text == '': text = self.langtab[qual] else: diff --git a/wikimarkup.py b/wikimarkup.py index 8ed5c46..46aa839 100644 --- a/wikimarkup.py +++ b/wikimarkup.py @@ -352,7 +352,7 @@ class WikiMarkup (BaseWikiMarkup): file = None text = None lang = 'en' - html_base = 'http://%(lang)s.wiktionary.org/wiki' + 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' |