X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=665fdcddcfe35d6fd3806aafa5488f72e3b56294;hb=19a5965153825e54776ae1669f6ef58d7cdbc2a8;hp=71bd4c7e6ac1b81bd864aa789a8c27242574236f;hpb=683b3a05e2901f2e036bf1b2c873347fa0eb0434;p=lyx.git

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 71bd4c7e6a..665fdcddcf 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -107,7 +107,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
     CounterFormat = re.compile(r'^\s*PrettyFormat\s+"?(.*)"?\s*$', re.IGNORECASE)
     CiteFormat = re.compile(r'^\s*CiteFormat', re.IGNORECASE)
     # Note: preceding and trailing space in the val below matters
-    KeyVal = re.compile(r'^\s*_\w+\s(.*\S)*$')
+    KeyVal = re.compile(r'^\s*B?_\w+\s(.*\S)*$')
     Float = re.compile(r'^\s*Float\s*$', re.IGNORECASE)
     UsesFloatPkg = re.compile(r'^\s*UsesFloatPkg\s+(.*\S)\s*$', re.IGNORECASE)
     IsPredefined = re.compile(r'^\s*IsPredefined\s+(.*\S)\s*$', re.IGNORECASE)
@@ -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'):
@@ -639,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
@@ -659,7 +659,7 @@ def tabletemplates_l10n(input_files, output, base):
   # only record each item once
   seen = []
   for file in input_files:
-      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":
               continue
@@ -691,7 +691,7 @@ 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
@@ -722,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', 'tabletemplates'] 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)
 
@@ -743,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':