X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Flyx_pot.py;h=d783fe9ff84a77d5c3ba7f4e8e3454873dfe2e5e;hb=268ae66e3c7df04effc329373dc887715d9c6f06;hp=c92939c9b90e4fabaacdbc443b96fa295c77399a;hpb=0a035283765d3d5d476430cb635694336c442c87;p=lyx.git
diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index c92939c9b9..d783fe9ff8 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -19,6 +19,7 @@
from __future__ import print_function
import sys, os, re, getopt
+import io
def relativePath(path, base):
'''return relative path from top source dir'''
@@ -37,13 +38,13 @@ def writeString(outfile, infile, basefile, lineno, string):
string = string.replace('\\', '\\\\').replace('"', '')
if string == "":
return
- print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(infile, basefile), lineno, string), file=outfile)
def ui_l10n(input_files, output, base):
'''Generate pot file from lib/ui/*'''
- output = open(output, 'w')
+ 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)
IconPalette = re.compile(r'^[^#]*IconPalette\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
@@ -51,7 +52,7 @@ def ui_l10n(input_files, output, base):
Item = re.compile(r'[^#]*Item\s+"([^"]*)"', re.IGNORECASE)
TableInsert = re.compile(r'[^#]*TableInsert\s+"([^"]*)"', re.IGNORECASE)
for src in input_files:
- input = open(src)
+ input = io.open(src, encoding='utf_8')
for lineno, line in enumerate(input.readlines()):
if Submenu.match(line):
(string,) = Submenu.match(line).groups()
@@ -70,29 +71,31 @@ def ui_l10n(input_files, output, base):
continue
string = string.replace('"', '')
if string != "":
- print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(src, base), lineno+1, string), file=output)
input.close()
output.close()
def layouts_l10n(input_files, output, base, layouttranslations):
- '''Generate pot file from lib/layouts/*.{layout,inc,module}'''
+ '''Generate pot file from lib/layouts/*.{layout,inc,module} and lib/citeengines/*.citeengine'''
ClassDescription = re.compile(r'^\s*#\s*\\Declare(LaTeX|DocBook)Class.*\{(.*)\}$', re.IGNORECASE)
ClassCategory = re.compile(r'^\s*#\s*\\DeclareCategory\{(.*)\}$', re.IGNORECASE)
Style = re.compile(r'^\s*Style\s+(.*\S)\s*$', re.IGNORECASE)
# match LabelString, EndLabelString, LabelStringAppendix and maybe others but no comments
LabelString = re.compile(r'^[^#]*LabelString\S*\s+(.*\S)\s*$', re.IGNORECASE)
MenuString = re.compile(r'^[^#]*MenuString\S*\s+(.*\S)\s*$', re.IGNORECASE)
+ OutlinerName = re.compile(r'^[^#]*OutlinerName\s+(\S+|\"[^\"]*\")\s+\"([^\"]*)\"', re.IGNORECASE)
Tooltip = re.compile(r'^\s*Tooltip\S*\s+(.*\S)\s*$', re.IGNORECASE)
GuiName = re.compile(r'^\s*GuiName\s+(.*\S)\s*$', re.IGNORECASE)
ListName = re.compile(r'^\s*ListName\s+(.*\S)\s*$', re.IGNORECASE)
CategoryName = re.compile(r'^\s*Category\s+(.*\S)\s*$', re.IGNORECASE)
NameRE = re.compile(r'^\s*#\s*\\DeclareLyXModule.*{(.*)}$', re.IGNORECASE)
+ CiteNameRE = re.compile(r'^\s*#\s*\\DeclareLyXCiteEngine.*\{(.*)\}$', re.IGNORECASE)
InsetLayout = re.compile(r'^InsetLayout\s+\"?(.*)\"?\s*$', re.IGNORECASE)
FlexCheck = re.compile(r'^Flex:(.*)', re.IGNORECASE)
CaptionCheck = re.compile(r'^Caption:(.*)', re.IGNORECASE)
- DescBegin = re.compile(r'^\s*#DescriptionBegin\s*$', re.IGNORECASE)
+ DescBegin = re.compile(r'^\s*#\s*DescriptionBegin\s*$', re.IGNORECASE)
DescEnd = re.compile(r'^\s*#\s*DescriptionEnd\s*$', re.IGNORECASE)
Category = re.compile(r'^\s*#\s*Category:\s+(.*\S)\s*$', re.IGNORECASE)
I18nPreamble = re.compile(r'^\s*((Lang)|(Babel))Preamble\s*$', re.IGNORECASE)
@@ -100,7 +103,8 @@ def layouts_l10n(input_files, output, base, layouttranslations):
I18nString = re.compile(r'_\(([^\)]+)\)')
CounterFormat = re.compile(r'^\s*PrettyFormat\s+"?(.*)"?\s*$', re.IGNORECASE)
CiteFormat = re.compile(r'^\s*CiteFormat', re.IGNORECASE)
- KeyVal = re.compile(r'^\s*_\w+\s+(.*\S)\s*$')
+ # Note: preceding and trailing space in the val below matters
+ KeyVal = re.compile(r'^\s*_\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)
@@ -124,7 +128,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
# read old translations if available
try:
- input = open(output)
+ input = io.open(output, encoding='utf_8')
lang = ''
for line in input.readlines():
res = Comment.search(line)
@@ -146,8 +150,8 @@ def layouts_l10n(input_files, output, base, layouttranslations):
continue
res = KeyValPair.search(line)
if res and lang != '':
- key = res.group(1).decode('utf-8')
- val = res.group(2).decode('utf-8')
+ key = res.group(1)
+ val = res.group(2)
key = key.replace('\\"', '"').replace('\\\\', '\\')
val = val.replace('\\"', '"').replace('\\\\', '\\')
oldtrans[lang][key] = val
@@ -164,7 +168,10 @@ def layouts_l10n(input_files, output, base, layouttranslations):
if 'wa' in languages:
languages.remove('wa')
- out = open(output, 'w')
+ if layouttranslations:
+ out = io.open(output, 'w', encoding='utf_8')
+ else:
+ out = io.open(output, 'w', encoding='utf_8', newline='\n')
for src in input_files:
readingDescription = False
readingI18nPreamble = False
@@ -177,7 +184,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
descStartLine = -1
descLines = []
lineno = 0
- for line in open(src).readlines():
+ for line in io.open(src, encoding='utf_8').readlines():
lineno += 1
res = ClassDescription.search(line)
if res != None:
@@ -224,6 +231,12 @@ def layouts_l10n(input_files, output, base, layouttranslations):
readingI18nPreamble = True
continue
res = NameRE.search(line)
+ if res != None:
+ string = res.group(1)
+ if not layouttranslations:
+ writeString(out, src, base, lineno + 1, string)
+ continue
+ res = CiteNameRE.search(line)
if res != None:
string = res.group(1)
if not layouttranslations:
@@ -250,6 +263,12 @@ def layouts_l10n(input_files, output, base, layouttranslations):
if not layouttranslations:
writeString(out, src, base, lineno, string)
continue
+ res = OutlinerName.search(line)
+ if res != None:
+ string = res.group(2)
+ if not layouttranslations:
+ writeString(out, src, base, lineno, string)
+ continue
res = Tooltip.search(line)
if res != None:
string = res.group(1)
@@ -374,7 +393,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
ContextRe = re.compile(r'(.*)(\[\[.*\]\])')
- print('''# This file has been automatically generated by po/lyx_pot.py.
+ print(u'''# This file has been automatically generated by po/lyx_pot.py.
# PLEASE MODIFY ONLY THE LAGUAGES HAVING NO .po FILE! If you want to regenerate
# this file from the translations, run `make ../lib/layouttranslations' in po.
# Python polib library is needed for building the output file.
@@ -382,7 +401,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
# This file should remain fixed during minor LyX releases.
# For more comments see README.localization file.''', file=out)
for lang in languages:
- print('\nTranslation %s' % lang, file=out)
+ print(u'\nTranslation %s' % lang, file=out)
if lang in list(oldtrans.keys()):
trans = oldtrans[lang]
else:
@@ -408,8 +427,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
if res != None:
val = res.group(1)
key = key.replace('\\', '\\\\').replace('"', '\\"')
- print('\t"%s" "%s"' % \
- (key.encode('utf-8'), val.encode('utf-8')), file=out)
+ print(u'\t"%s" "%s"' % (key, val), file=out)
# also print untranslated entries to help translators
elif not lang in oldlanguages:
key = key.replace('\\', '\\\\').replace('"', '\\"')
@@ -418,20 +436,19 @@ def layouts_l10n(input_files, output, base, layouttranslations):
val = res.group(1)
else:
val = key
- print('\t"%s" "%s"' % \
- (key.encode('utf-8'), val.encode('utf-8')), file=out)
- print('End', file=out)
+ print(u'\t"%s" "%s"' % (key, val), file=out)
+ print(u'End', file=out)
out.close()
def qt4_l10n(input_files, output, base):
'''Generate pot file from src/frontends/qt4/ui/*.ui'''
- output = open(output, 'w')
+ output = io.open(output, 'w', encoding='utf_8', newline='\n')
pat = re.compile(r'\s*(.*)')
prop = re.compile(r'\s*
@@ -448,7 +465,7 @@ def qt4_l10n(input_files, output, base):
string = string.replace('<', '<').replace('>', '>')
string = string.replace('\\', '\\\\').replace('"', r'\"')
string = string.replace('
', r'\n')
- print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(src, base), lineno+1, string), file=output)
input.close()
output.close()
@@ -456,47 +473,47 @@ def qt4_l10n(input_files, output, base):
def languages_l10n(input_files, output, base):
'''Generate pot file from lib/languages'''
- out = open(output, 'w')
+ out = io.open(output, 'w', encoding='utf_8', newline='\n')
GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
-
+
for src in input_files:
descStartLine = -1
descLines = []
lineno = 0
- for line in open(src).readlines():
+ for line in io.open(src, encoding='utf_8').readlines():
lineno += 1
res = GuiName.search(line)
if res != None:
string = res.group(1)
writeString(out, src, base, lineno, string)
continue
-
+
out.close()
def latexfonts_l10n(input_files, output, base):
'''Generate pot file from lib/latexfonts'''
- out = open(output, 'w')
+ out = io.open(output, 'w', encoding='utf_8', newline='\n')
GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
-
+
for src in input_files:
descStartLine = -1
descLines = []
lineno = 0
- for line in open(src).readlines():
+ for line in io.open(src, encoding='utf_8').readlines():
lineno += 1
res = GuiName.search(line)
if res != None:
string = res.group(1)
writeString(out, src, base, lineno, string)
continue
-
+
out.close()
def external_l10n(input_files, output, base):
- '''Generate pot file from lib/external_templates'''
- output = open(output, 'w')
+ '''Generate pot file from lib/xtemplates'''
+ output = io.open(output, 'w', encoding='utf_8', newline='\n')
Template = re.compile(r'^Template\s+(.*)', re.IGNORECASE)
GuiName = re.compile(r'\s*GuiName\s+(.*)', re.IGNORECASE)
HelpTextStart = re.compile(r'\s*HelpText\s', re.IGNORECASE)
@@ -504,7 +521,7 @@ def external_l10n(input_files, output, base):
HelpTextEnd = re.compile(r'\s*HelpTextEnd\s', re.IGNORECASE)
i = -1
for src in input_files:
- input = open(src)
+ input = io.open(src, encoding='utf_8')
inHelp = False
hadHelp = False
prev_help_string = ''
@@ -516,7 +533,7 @@ def external_l10n(input_files, output, base):
elif inHelp:
if HelpTextEnd.match(line):
if hadHelp:
- print('\nmsgstr ""\n', file=output)
+ print(u'\nmsgstr ""\n', file=output)
inHelp = False
hadHelp = False
prev_help_string = ''
@@ -524,11 +541,11 @@ def external_l10n(input_files, output, base):
(help_string,) = HelpTextSection.match(line).groups()
help_string = help_string.replace('"', '')
if help_string != "" and prev_help_string == '':
- print('#: %s:%d\nmsgid ""\n"%s\\n"' % \
+ print(u'#: %s:%d\nmsgid ""\n"%s\\n"' % \
(relativePath(src, base), lineno+1, help_string), file=output)
hadHelp = True
elif help_string != "":
- print('"%s\\n"' % help_string, file=output)
+ print(u'"%s\\n"' % help_string, file=output)
prev_help_string = help_string
elif HelpTextStart.match(line):
inHelp = True
@@ -537,7 +554,7 @@ def external_l10n(input_files, output, base):
continue
string = string.replace('"', '')
if string != "" and not inHelp:
- print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(src, base), lineno+1, string), file=output)
input.close()
output.close()
@@ -545,10 +562,10 @@ def external_l10n(input_files, output, base):
def formats_l10n(input_files, output, base):
'''Generate pot file from configure.py'''
- output = open(output, 'w')
+ output = io.open(output, 'w', encoding='utf_8', newline='\n')
GuiName = re.compile(r'.*\\Format\s+\S+\s+\S+\s+"([^"]*)"\s+(\S*)\s+.*', re.IGNORECASE)
GuiName2 = re.compile(r'.*\\Format\s+\S+\s+\S+\s+([^"]\S+)\s+(\S*)\s+.*', re.IGNORECASE)
- input = open(input_files[0])
+ input = io.open(input_files[0], encoding='utf_8')
for lineno, line in enumerate(input.readlines()):
label = ""
labelsc = ""
@@ -564,10 +581,10 @@ def formats_l10n(input_files, output, base):
if shortcut != "":
labelsc = label + "|" + shortcut
if label != "":
- print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(input_files[0], base), lineno+1, label), file=output)
if labelsc != "":
- print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(input_files[0], base), lineno+1, labelsc), file=output)
input.close()
output.close()
@@ -575,16 +592,16 @@ def formats_l10n(input_files, output, base):
def encodings_l10n(input_files, output, base):
'''Generate pot file from lib/encodings'''
- output = open(output, 'w')
+ 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+.*')
- input = open(input_files[0])
+ 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('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
+ print(u'#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(input_files[0], base), lineno+1, reg.match(line).groups()[0]), file=output)
else:
print("Error: Unable to handle line:")
@@ -614,7 +631,7 @@ where
languages: file lib/languages
latexfonts: file lib/latexfonts
encodings: file lib/encodings
- external: external templates file
+ external: external templates files
formats: formats predefined in lib/configure.py
'''
@@ -637,7 +654,7 @@ if __name__ == '__main__':
elif opt in ['-t', '--type']:
input_type = value
elif opt in ['-s', '--src_file']:
- input_files = [f.strip() for f in open(value)]
+ 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'] or output is None:
print('Wrong input type or output filename.')
@@ -645,6 +662,13 @@ if __name__ == '__main__':
input_files += args
+ # Ensure a unique sorting of input files and ignore the order in which they
+ # are given on the command line. This is important to avoid huge
+ # pseudo-diffs in the generated .pot file which would then end up in the
+ # .po files as well. We had this situation for years with people using
+ # different build systems to remerge .po files.
+ input_files.sort()
+
if input_type == 'ui':
ui_l10n(input_files, output, base)
elif input_type == 'latexfonts':