X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Flangdefs.py;h=37159c519854bbfad079017f4f45ad16fed0bae2;hb=0dba8aca9a2b6a19764622136fd72e8bcc842e19;hp=2b79caee70e581e5ee804ec9cbf5d55b46d58ee4;hpb=24d7a2abc788061a4f7a81ee3c2a9f330ddca93f;p=lilypond.git diff --git a/python/langdefs.py b/python/langdefs.py index 2b79caee70..37159c5198 100644 --- a/python/langdefs.py +++ b/python/langdefs.py @@ -6,6 +6,8 @@ Documentation i18n module """ import re +import sys +import os def lang_file_name (p, langext, ext): if langext != '': @@ -34,17 +36,28 @@ class LanguageDef: site = LanguageDef ('en', 'English', webext='') -html_page_body = re.compile ('', re.M | re.I) +html_body_re = re.compile ('', re.I) +html_end_body_re = re.compile ('', re.I) french_html_typo_rules = ((' :', ' :'), (' ;', ' ;'), - (' ?', ' ?'), - (' !', ' !')) + (' ?', ' ?'), + (' !', ' !')) def french_html_filter (page): - parts = html_page_body.split (page) + m = html_body_re.search (page) + if m: + body_begin = m.end () + else: + body_begin = 0 + m = html_end_body_re.search (page) + if m: + body_end = m.start () + else: + body_end = len (page) + body = page[body_begin:body_end] for r in french_html_typo_rules: - parts[1] = parts[1].replace (r[0], r[1]) - return parts[0] + '' + parts[1] + '' + parts[2] + body = body.replace (r[0], r[1]) + return page[:body_begin] + body + page[body_end:] fr = LanguageDef ('fr', 'franÃ§ais', double_punct_char_sep=' ', html_filter = french_html_filter) es = LanguageDef ('es', 'espaÃ±ol') @@ -65,7 +78,6 @@ else: try: import gettext - import os translation = {} for l in LANGUAGES: @@ -75,5 +87,6 @@ else: [l.code]) translation[l.code] = t.gettext except: - sys.stderr.write ('URGUHIU\n') + if os.environ.has_key ('LYDOC_LOCALEDIR'): + sys.stderr.write ('langdefs.py: warning: lilypond-doc gettext domain not found.\n') translation = dict ([(l.code, lambda x: x) for l in LANGUAGES])