From 953fa2601331653cb2306b0733359ea18891ef67 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 5 Dec 2010 14:09:34 +0000 Subject: [PATCH] Web: fix 1363. --- scripts/build/create-weblinks-itexi.py | 21 ++++++++++++++------- scripts/build/website_post.py | 15 ++++++++------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/scripts/build/create-weblinks-itexi.py b/scripts/build/create-weblinks-itexi.py index 40df423e95..cba097c46f 100644 --- a/scripts/build/create-weblinks-itexi.py +++ b/scripts/build/create-weblinks-itexi.py @@ -343,6 +343,12 @@ def translateNameToUrl(manual, version): else: return '' +def addLang(url, lang): + if lang: + base, ext = os.path.splitext(url) + return base + '.' + lang + ext + else: + return url def make_manual_links(name, version, lang): """Here is where all the macros manualStableLearningSplit, @@ -382,32 +388,33 @@ def make_manual_links(name, version, lang): # until 2.14 is out. -gp if (url.endswith('.html')): make_ver_link(macroLang("manual"+name+mshort+'Pdf',lang), - url, + addLang(url, lang), getTrans(manual.capitalize(),lang) + '.pdf') make_ver_link(macroLang("manual"+name+mshort+'Split',lang), - url, + addLang(url, lang), getTrans(manual.capitalize(),lang) + getTrans(' (split HTML)',lang)) make_ver_link(macroLang("manual"+name+mshort+'Big',lang), - url, + addLang(url, lang), getTrans(manual.capitalize(),lang) + getTrans(' (big HTML)',lang)) newurl = url else: make_ver_link(macroLang("manual"+name+mshort+'Pdf',lang), - url + '.pdf', + # TODO: this is an even stupider way of doing it + addLang(url+'.pdf', lang), getTrans(manual.capitalize(),lang) + '.pdf') make_ver_link(macroLang("manual"+name+mshort+'Split',lang), - url + '/index.html', + addLang(url + '/index.html', lang), getTrans(manual.capitalize(),lang) + getTrans(' (split HTML)',lang)) make_ver_link(macroLang("manual"+name+mshort+'Big',lang), - url + '-big-page.html', + addLang(url + '-big-page.html', lang), getTrans(manual.capitalize(),lang) + getTrans(' (big HTML)',lang)) newurl = url + '/index.html' make_ver_link(macroLang("manual"+name+mshort+'SplitNoName',lang), - newurl, + addLang(newurl, lang), getTrans(manual.capitalize(),lang)) def make_regtest_links(name, version, lang): diff --git a/scripts/build/website_post.py b/scripts/build/website_post.py index 5267a85828..d4e8c4baf1 100644 --- a/scripts/build/website_post.py +++ b/scripts/build/website_post.py @@ -170,13 +170,14 @@ for file in html_files: ### alter links as appropriate link = getLocalHref(line) if (link != ""): - # quesitonable - if (link.endswith(".html")): - langlink = addLangExt(link[:-5], lang, "html") - line = line.replace(link, langlink) - if (link.endswith(".pdf")): - langlink = addLangExt(link[:-4], lang, "pdf") - line = line.replace(link, langlink) + # questionable + if (not link.startswith("../doc/")): + if (link.endswith(".html")): + langlink = addLangExt(link[:-5], lang, "html") + line = line.replace(link, langlink) + if (link.endswith(".pdf")): + langlink = addLangExt(link[:-4], lang, "pdf") + line = line.replace(link, langlink) ### add google tracker header if (line.find("") >= 0): outfile.write(""" -- 2.39.2