Merge http://git.sv.gnu.org/r/lilypond

[lilypond.git] / buildscripts / www_post.py

diff --git a/buildscripts/www_post.py b/buildscripts/www_post.py
index 6dded57b341238cd99fdded2875c7a16f1c4b3cb..39c0747d7e309ad19185765f1f823ddf6ae36e64 100644 (file)
--- a/buildscripts/www_post.py
+++ b/buildscripts/www_post.py
@@ -9,8 +9,9 @@
 import sys
 import os
 import re
+import gettext
 
-package_name, package_version, buildscript_dir, outdir, targets = sys.argv[1:]
+package_name, package_version, buildscript_dir, localedir, outdir, targets = sys.argv[1:]
 targets = targets.split (' ')
 outdir = os.path.normpath (outdir)
 doc_dirs = ['input', 'Documentation', outdir]
@@ -79,20 +80,16 @@ if 'online' in targets:
     f.close ()
 
 # load gettext messages catalogs
-t = {}
-localedir = os.path.join (buildscript_dir, '../Documentation/po', outdir)
+translation = {}
 for l in langdefs.LANGUAGES:
     if l.enabled and l.code != 'en':
-        try:
-            t[l.code] = gettext.translation('lilypond-doc', localedir, [l.code]).gettext
-        except:
-            t[l.code] = lambda s: s
+        translation[l.code] = gettext.translation('lilypond-doc', localedir, [l.code]).gettext
 
 add_html_footer.build_pages_dict (html_files)
 for t in targets:
     sys.stderr.write ("Processing HTML pages for %s target...\n" % t)
     add_html_footer.add_html_footer (
-        translation = t
+        translation = translation,
         package_name = package_name,
         package_version = package_version,
         target = t,