Fix focus proxy.

[lyx.git] / po / lyx_pot.py

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 5660e45abd8e5df42f0dcce20d5eac3771b4dc1e..2dd883aec5fd0fc5e45fd8df6b26ee59c9cae824 100755 (executable)
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -18,12 +18,11 @@
 #
 import sys, os, re, getopt
 
-
 def relativePath(path, base):
     '''return relative path from top source dir'''
     # full pathname of path
     path1 = os.path.normpath(os.path.realpath(path)).split(os.sep)
-    path2 = os.path.normpath(base).split(os.sep)
+    path2 = os.path.normpath(os.path.realpath(base)).split(os.sep)
     if path1[:len(path2)] != path2:
         print "Path %s is not under top source directory" % path
     return os.path.join(*path1[len(path2):])
@@ -38,7 +37,6 @@ def ui_l10n(input_files, output, base):
     for src in input_files:
         input = open(src)
         for lineno, line in enumerate(input.readlines()):
-            # get lines that match <string>...</string>
             if Submenu.match(line):
                 (string,) = Submenu.match(line).groups()
                 string = string.replace('_', ' ')
@@ -67,7 +65,6 @@ def layouts_l10n(input_files, output, base):
     for src in input_files:
         input = open(src)
         for lineno, line in enumerate(input.readlines()):
-            # get lines that match <string>...</string>
             if Style.match(line):
                 (string,) = Style.match(line).groups()
                 string = string.replace('_', ' ')
@@ -96,11 +93,10 @@ def qt4_l10n(input_files, output, base):
         input = open(src)
         skipNextLine = False
         for lineno, line in enumerate(input.readlines()):
-            # looking for a line with <string></string>
+            # skip the line after <property name=shortcut>
             if skipNextLine:
                 skipNextLine = False
                 continue
-            # skip the line after <property name=shortcut>
             if prop.match(line):
                 skipNextLine = True
                 continue
@@ -138,21 +134,6 @@ def languages_l10n(input_files, output, base):
     output.close()
 
 
-def processFiles(input_type, input_files, output, base):
-    '''Process files according to input_type'''
-    if input_type not in ['ui', 'layouts', 'qt4', 'languages'] or output is None:
-        print 'Wrong input type or output filename.'
-        sys.exit(1)
-    if input_type == 'ui':
-        ui_l10n(input_files, output, base)
-    elif input_type == 'layouts':
-        layouts_l10n(input_files, output, base)
-    elif input_type == 'qt4':
-        qt4_l10n(input_files, output, base)
-    else:
-        languages_l10n(input_files, output, base)
-
-
 Usage = '''
 lyx_pot.py [-b|--base top_src_dir] [-o|--output output_file] [-h|--help] -t|--type input_type input_files