Review of pt layouttranslation by Jose

[lyx.git] / po / lyx_pot.py

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index cbe4b8fecdec0d7c46169a9da6c0547fd64027c6..665fdcddcfe35d6fd3806aafa5488f72e3b56294 100755 (executable)
--- 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)
@@ -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