summaryrefslogtreecommitdiffabout
authorWojciech Polak <polak@gnu.org>2008-11-29 10:15:16 (GMT)
committer Wojciech Polak <polak@gnu.org>2008-11-29 10:15:16 (GMT)
commitf7a8c1c22c8e362e94768d3e93d74a85f82a3b1a (patch) (side-by-side diff)
tree7b191a6992ef49d8707d7cedc3ae069980af8588
parentcfe445a92d11e206c63a4e73588cced065df104f (diff)
downloadwikitrans-f7a8c1c22c8e362e94768d3e93d74a85f82a3b1a.tar.gz
wikitrans-f7a8c1c22c8e362e94768d3e93d74a85f82a3b1a.tar.bz2
Add slash to html_base explicitely.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--wiki2html.py5
-rw-r--r--wikimarkup.py2
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'

Return to:

Send suggestions and report system problems to the System administrator.