Try to make findadv more robust if not ignoring format

[lyx.git] / po / lyx_pot.py

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index d783fe9ff84a77d5c3ba7f4e8e3454873dfe2e5e..173d29e8cac573bb5ba5da1856c79a7a2143ee81 100755 (executable)
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -47,6 +47,7 @@ def ui_l10n(input_files, output, base):
     output = io.open(output, 'w', encoding='utf_8', newline='\n')
     Submenu = re.compile(r'^[^#]*Submenu\s+"([^"]*)"', re.IGNORECASE)
     Popupmenu = re.compile(r'^[^#]*PopupMenu\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
+    Dynamicmenu = re.compile(r'^[^#]*DynamicMenu\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
     IconPalette = re.compile(r'^[^#]*IconPalette\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
     Toolbar = re.compile(r'^[^#]*Toolbar\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
     Item = re.compile(r'[^#]*Item\s+"([^"]*)"', re.IGNORECASE)
@@ -59,6 +60,8 @@ def ui_l10n(input_files, output, base):
                 string = string.replace('_', ' ')
             elif Popupmenu.match(line):
                 (string,) = Popupmenu.match(line).groups()
+            elif Dynamicmenu.match(line):
+                (string,) = Dynamicmenu.match(line).groups()
             elif IconPalette.match(line):
                 (string,) = IconPalette.match(line).groups()
             elif Toolbar.match(line):
@@ -540,6 +543,8 @@ def external_l10n(input_files, output, base):
                 elif HelpTextSection.match(line):
                     (help_string,) = HelpTextSection.match(line).groups()
                     help_string = help_string.replace('"', '')
+                    help_string =  help_string.replace('\\', '_backsl_')
+                    help_string =  help_string.replace('_backsl_', '\\\\')
                     if help_string != "" and prev_help_string == '':
                         print(u'#: %s:%d\nmsgid ""\n"%s\\n"' % \
                             (relativePath(src, base), lineno+1, help_string), file=output)
@@ -547,6 +552,10 @@ def external_l10n(input_files, output, base):
                     elif help_string != "":
                         print(u'"%s\\n"' % help_string, file=output)
                     prev_help_string = help_string
+                else:
+                    # Empty line
+                    print(u'"\\n"', file=output)
+                    prev_help_string = 'xxxx'
             elif HelpTextStart.match(line):
                 inHelp = True
                 prev_help_string = ''
@@ -595,14 +604,16 @@ def encodings_l10n(input_files, output, base):
     output = io.open(output, 'w', encoding='utf_8', newline='\n')
     # assuming only one encodings file
     #                 Encoding utf8      utf8    "Unicode (utf8)" UTF-8    variable inputenc
-    reg = re.compile('Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)]+)"\s+[\w-]+\s+(fixed|variable|variableunsafe)\s+\w+.*')
+    reg = re.compile('Encoding [\w-]+\s+[\w-]+\s+"([\w \-\(\)^"]*)"\s+["\w-]+\s+(fixed|variable|variableunsafe)\s+\w+.*')
     input = io.open(input_files[0], encoding='utf_8')
     for lineno, line in enumerate(input.readlines()):
         if not line.startswith('Encoding'):
             continue
         if reg.match(line):
-            print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                (relativePath(input_files[0], base), lineno+1, reg.match(line).groups()[0]), file=output)
+            guiname = reg.match(line).groups()[0]
+            if guiname != "":
+                print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(input_files[0], base), lineno+1, guiname), file=output)
         else:
             print("Error: Unable to handle line:")
             print(line)