From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 2 Apr 2010 19:41:44 +0000 (+0200)
Subject: website_post.py: Refactor makeFooter string building macramee.
X-Git-Tag: release/2.13.18-1~18^2~1^2~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ff872773ac4aa6048413016dec3173e58276b41d;p=lilypond.git

website_post.py: Refactor makeFooter string building macramee.
---

diff --git a/scripts/build/website_post.py b/scripts/build/website_post.py
index 368e88842e..fbb462a51d 100644
--- a/scripts/build/website_post.py
+++ b/scripts/build/website_post.py
@@ -13,27 +13,27 @@ import re
 translations = {
     'de': {
         'English': 'Deutsch',
-        'Other languages: ': 'Andere Sprachen: ',
+        'Other languages': 'Andere Sprachen',
         },
     'es': {
         'English': 'Español',
-        'Other languages: ': 'Otros idiomas: ',
+        'Other languages': 'Otros idiomas',
         },
     'fr': {
         'English': 'Français',
-        'Other languages: ': 'Autres langues: ',
+        'Other languages': 'Autres langues',
         },
     'hu': {
         'English': 'Magyar',
-        'Other languages: ': 'Más nyelvek: ',
+        'Other languages': 'Más nyelvek',
         },
     'ja': {
         'English': 'Japanese',
-        'Other languages: ': '他の言語: ',
+        'Other languages': '他の言語',
         },
     'nl': {
         'English': 'Nederlands',
-        'Other languages: ': 'Andere talen: ',
+        'Other languages': 'Andere talen',
         },
     }
 
@@ -93,22 +93,21 @@ def addLangExt(filename, lang, ext):
     text += "." + ext
     return text
 
-def makeFooter(filename, currentLang):
-    text = "<p id=\"languages\">\n"
-    text += _ ('Other languages: ', currentLang)
-    for lang in langs:
-        if (lang == currentLang):
-            continue
-        text += "<a href=\""
-	text += addLangExt(filename, lang, "html")
-        text += "\">"
-        text += _ ('English', lang)
-        text += "</a>, "
-    text = text[:-2] + '.\n'
+def makeFooter (filename, currentLang):
     # TODO: add link to automatic language selection?
     # still need to include this page in the new webpages somewhere
-    text += "</p>\n"
-    return text
+    footer = '''<p id="languages">
+%(other)s: %(lst)s.
+</p>
+'''
+    def link (lang):
+        str = '''<a href="%(file_name)s">%(language_name)s</a>'''
+        file_name = addLangExt (filename, lang, 'html')
+        language_name = _ ('English', lang)
+        return str % locals ()
+    lst = ', '.join ([link (lang) for lang in langs if lang != currentLang])
+    other = _ ('Other languages', currentLang)
+    return footer % locals ()
 
 def getLocalHref(line):
     match = re.search(r'href=[\'"]?([^\'" >]+)', line)
@@ -155,7 +154,7 @@ for file in html_files:
     os.remove(file)
     outfile = open(file, 'w')
 
-    lang_footer = makeFooter(file_base, lang)
+    lang_footer = makeFooter (file_base, lang)
 
     ### alter file
     for line in lines: