X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=4e15b1f13971cdd6ac1034225d1443463d65ab43;hb=39a28b4b27af761c7b04fe86eee89c19e2dac5d5;hp=226e6ecf859feaac32c8d7c6788d76e9cc9883d6;hpb=c8930f63427a0c5da6a8693a50f01484ae0a3858;p=lyx.git

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 226e6ecf85..4e15b1f139 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -445,8 +445,8 @@ def layouts_l10n(input_files, output, base, layouttranslations):
     out.close()
 
 
-def qt4_l10n(input_files, output, base):
-    '''Generate pot file from src/frontends/qt4/ui/*.ui'''
+def qt_l10n(input_files, output, base):
+    '''Generate pot file from src/frontends/qt/ui/*.ui'''
     output = io.open(output, 'w', encoding='utf_8', newline='\n')
     pat = re.compile(r'\s*<string>(.*)</string>')
     prop = re.compile(r'\s*<property.*name.*=.*shortcut')
@@ -604,7 +604,7 @@ 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'):
@@ -628,8 +628,7 @@ def examples_templates_l10n(input_files, output, base):
   output = io.open(output, 'w', encoding='utf_8', newline='\n')
   # only record each item once
   seen = []
-  inputfs = input_files[0].split()
-  for src in inputfs:
+  for src in input_files:
       parseExamplesTemplates(src, seen, output)
   output.close()
 
@@ -640,7 +639,7 @@ def parseExamplesTemplates(file, seen, output):
       for sfile in glob.glob( os.path.join(file, '*') ):
           parseExamplesTemplates(sfile, seen, output)
 
-  filename = file.split(os.sep)[-1]
+  filename = os.path.normpath(os.path.realpath(file)).split(os.sep)[-1]
   if os.path.isfile(file):
       if filename[-4:] != ".lyx":
           return
@@ -651,9 +650,32 @@ def parseExamplesTemplates(file, seen, output):
   seen.append(filename)
   if filename != "":
       print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
-                (relativePath(input_files[0], base), 0, filename.replace('_', ' ')), file=output)
+                (relativePath(input_files[0], base), 0, filename.replace('_', ' ').replace('%26', '&').replace('%28', '(').replace('%29', ')')), file=output)
 
 
+def tabletemplates_l10n(input_files, output, base):
+  '''Generate pot file from lib/tabletemplates '''
+  output = io.open(output, 'w', encoding='utf_8', newline='\n')
+  # only record each item once
+  seen = []
+  for file in input_files:
+      filename = os.path.normpath(os.path.realpath(file)).split(os.sep)[-1]
+      if os.path.isfile(file):
+          if filename[-4:] != ".lyx":
+              continue
+          filename = filename[:-4]
+          if filename[-4:-1] == "_1x":
+              continue
+          if seen.count(filename):
+              continue
+
+      seen.append(filename)
+      if filename != "":
+          print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+                    (relativePath(input_files[0], base), 0, filename.replace('_', ' ')), file=output)
+  output.close()
+  
+
 
 Usage = '''
 lyx_pot.py [-b|--base top_src_dir] [-o|--output output_file] [-h|--help] [-s|src_file filename] -t|--type input_type input_files
@@ -669,13 +691,14 @@ where
         ui: lib/ui/*
         layouts: lib/layouts/*
         layouttranslations: create lib/layouttranslations from po/*.po and lib/layouts/*
-        qt4: qt4 ui files
+        qt: qt ui files
         languages: file lib/languages
         latexfonts: file lib/latexfonts
         encodings: file lib/encodings
         external: external templates files
         formats: formats predefined in lib/configure.py
         examples_templates: example and template files
+        tabletemplates: table template files
 '''
 
 if __name__ == '__main__':
@@ -699,7 +722,7 @@ if __name__ == '__main__':
         elif opt in ['-s', '--src_file']:
             input_files = [f.strip() for f in io.open(value, encoding='utf_8')]
 
-    if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'latexfonts', 'encodings', 'external', 'formats', 'examples_templates'] or output is None:
+    if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt', 'languages', 'latexfonts', 'encodings', 'external', 'formats', 'examples_templates', 'tabletemplates'] or output is None:
         print('Wrong input type or output filename.')
         sys.exit(1)
 
@@ -720,8 +743,8 @@ if __name__ == '__main__':
         layouts_l10n(input_files, output, base, False)
     elif input_type == 'layouttranslations':
         layouts_l10n(input_files, output, base, True)
-    elif input_type == 'qt4':
-        qt4_l10n(input_files, output, base)
+    elif input_type == 'qt':
+        qt_l10n(input_files, output, base)
     elif input_type == 'external':
         external_l10n(input_files, output, base)
     elif input_type == 'formats':
@@ -730,5 +753,7 @@ if __name__ == '__main__':
         encodings_l10n(input_files, output, base)
     elif input_type == 'examples_templates':
         examples_templates_l10n(input_files, output, base)
+    elif input_type == 'tabletemplates':
+        tabletemplates_l10n(input_files, output, base)
     else:
         languages_l10n(input_files, output, base)