anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

First step to make po python files to support both python 2 and python 3 (3.3+)

Browse Source 
Most of the changes are related with dictionaries returning iterators instead of
    lists. (Iterators and not views as I wrote in the previous commit message)

    xrange -> range (since xrange is gone in python 3)
This commit is contained in:
José Matos 2015-03-11 13:41:10 +00:00
parent 9a0d70a45f
commit 0a03528376
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
po/lyx_pot.py
View File

@ -16,9 +16,9 @@
# This script will extract translatable strings from input files and write # This script will extract translatable strings from input files and write
# to output in gettext .pot format. # to output in gettext .pot format.
# #
from __future__ import print_function
import sys, os, re, getopt import sys, os, re, getopt
if sys.version_info < (2, 4, 0):
from sets import Set as set
def relativePath(path, base): def relativePath(path, base):
'''return relative path from top source dir''' '''return relative path from top source dir'''
@ -26,7 +26,7 @@ def relativePath(path, base):
path1 = os.path.normpath(os.path.realpath(path)).split(os.sep) path1 = os.path.normpath(os.path.realpath(path)).split(os.sep)
path2 = os.path.normpath(os.path.realpath(base)).split(os.sep) path2 = os.path.normpath(os.path.realpath(base)).split(os.sep)
if path1[:len(path2)] != path2: if path1[:len(path2)] != path2:
print "Path %s is not under top source directory" % path print("Path %s is not under top source directory" % path)
path3 = os.path.join(*path1[len(path2):]); path3 = os.path.join(*path1[len(path2):]);
# replace all \ by / such that we get the same comments on Windows and *nix # replace all \ by / such that we get the same comments on Windows and *nix
path3 = path3.replace('\\', '/') path3 = path3.replace('\\', '/')
@ -37,8 +37,8 @@ def writeString(outfile, infile, basefile, lineno, string):
string = string.replace('\\', '\\\\').replace('"', '') string = string.replace('\\', '\\\\').replace('"', '')
if string == "": if string == "":
return return
print >> outfile, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(infile, basefile), lineno, string) (relativePath(infile, basefile), lineno, string), file=outfile)
def ui_l10n(input_files, output, base): def ui_l10n(input_files, output, base):
@ -70,8 +70,8 @@ def ui_l10n(input_files, output, base):
continue continue
string = string.replace('"', '') string = string.replace('"', '')
if string != "": if string != "":
print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(src, base), lineno+1, string) (relativePath(src, base), lineno+1, string), file=output)
input.close() input.close()
output.close() output.close()
@ -153,11 +153,11 @@ def layouts_l10n(input_files, output, base, layouttranslations):
oldtrans[lang][key] = val oldtrans[lang][key] = val
keyset.add(key) keyset.add(key)
continue continue
print "Error: Unable to handle line:" print("Error: Unable to handle line:")
print line print(line)
except IOError: except IOError:
print "Warning: Unable to open %s for reading." % output print("Warning: Unable to open %s for reading." % output)
print " Old translations will be lost." print(" Old translations will be lost.")
# walon is not a known document language # walon is not a known document language
# FIXME: Do not hardcode, read from lib/languages! # FIXME: Do not hardcode, read from lib/languages!
@ -374,16 +374,16 @@ def layouts_l10n(input_files, output, base, layouttranslations):
ContextRe = re.compile(r'(.*)(\[\[.*\]\])') ContextRe = re.compile(r'(.*)(\[\[.*\]\])')
print >> out, '''# This file has been automatically generated by po/lyx_pot.py. print('''# 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 # 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. # this file from the translations, run `make ../lib/layouttranslations' in po.
# Python polib library is needed for building the output file. # Python polib library is needed for building the output file.
# #
# This file should remain fixed during minor LyX releases. # This file should remain fixed during minor LyX releases.
# For more comments see README.localization file.''' # For more comments see README.localization file.''', file=out)
for lang in languages: for lang in languages:
print >> out, '\nTranslation %s' % lang print('\nTranslation %s' % lang, file=out)
if lang in oldtrans.keys(): if lang in list(oldtrans.keys()):
trans = oldtrans[lang] trans = oldtrans[lang]
else: else:
trans = dict() trans = dict()
@ -402,14 +402,14 @@ def layouts_l10n(input_files, output, base, layouttranslations):
if val != key: if val != key:
trans[key] = val trans[key] = val
for key in keys: for key in keys:
if key in trans.keys(): if key in list(trans.keys()):
val = trans[key].replace('\\', '\\\\').replace('"', '\\"') val = trans[key].replace('\\', '\\\\').replace('"', '\\"')
res = ContextRe.search(val) res = ContextRe.search(val)
if res != None: if res != None:
val = res.group(1) val = res.group(1)
key = key.replace('\\', '\\\\').replace('"', '\\"') key = key.replace('\\', '\\\\').replace('"', '\\"')
print >> out, '\t"%s" "%s"' % \ print('\t"%s" "%s"' % \
(key.encode('utf-8'), val.encode('utf-8')) (key.encode('utf-8'), val.encode('utf-8')), file=out)
# also print untranslated entries to help translators # also print untranslated entries to help translators
elif not lang in oldlanguages: elif not lang in oldlanguages:
key = key.replace('\\', '\\\\').replace('"', '\\"') key = key.replace('\\', '\\\\').replace('"', '\\"')
@ -418,9 +418,9 @@ def layouts_l10n(input_files, output, base, layouttranslations):
val = res.group(1) val = res.group(1)
else: else:
val = key val = key
print >> out, '\t"%s" "%s"' % \ print('\t"%s" "%s"' % \
(key.encode('utf-8'), val.encode('utf-8')) (key.encode('utf-8'), val.encode('utf-8')), file=out)
print >> out, 'End' print('End', file=out)
out.close() out.close()
@ -448,8 +448,8 @@ def qt4_l10n(input_files, output, base):
string = string.replace('&lt;', '<').replace('&gt;', '>') string = string.replace('&lt;', '<').replace('&gt;', '>')
string = string.replace('\\', '\\\\').replace('"', r'\"') string = string.replace('\\', '\\\\').replace('"', r'\"')
string = string.replace('&#x0a;', r'\n') string = string.replace('&#x0a;', r'\n')
print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(src, base), lineno+1, string) (relativePath(src, base), lineno+1, string), file=output)
input.close() input.close()
output.close() output.close()
@ -516,7 +516,7 @@ def external_l10n(input_files, output, base):
elif inHelp: elif inHelp:
if HelpTextEnd.match(line): if HelpTextEnd.match(line):
if hadHelp: if hadHelp:
print >> output, '\nmsgstr ""\n' print('\nmsgstr ""\n', file=output)
inHelp = False inHelp = False
hadHelp = False hadHelp = False
prev_help_string = '' prev_help_string = ''
@ -524,11 +524,11 @@ def external_l10n(input_files, output, base):
(help_string,) = HelpTextSection.match(line).groups() (help_string,) = HelpTextSection.match(line).groups()
help_string = help_string.replace('"', '') help_string = help_string.replace('"', '')
if help_string != "" and prev_help_string == '': if help_string != "" and prev_help_string == '':
print >> output, '#: %s:%d\nmsgid ""\n"%s\\n"' % \ print('#: %s:%d\nmsgid ""\n"%s\\n"' % \
(relativePath(src, base), lineno+1, help_string) (relativePath(src, base), lineno+1, help_string), file=output)
hadHelp = True hadHelp = True
elif help_string != "": elif help_string != "":
print >> output, '"%s\\n"' % help_string print('"%s\\n"' % help_string, file=output)
prev_help_string = help_string prev_help_string = help_string
elif HelpTextStart.match(line): elif HelpTextStart.match(line):
inHelp = True inHelp = True
@ -537,8 +537,8 @@ def external_l10n(input_files, output, base):
continue continue
string = string.replace('"', '') string = string.replace('"', '')
if string != "" and not inHelp: if string != "" and not inHelp:
print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(src, base), lineno+1, string) (relativePath(src, base), lineno+1, string), file=output)
input.close() input.close()
output.close() output.close()
@ -564,11 +564,11 @@ def formats_l10n(input_files, output, base):
if shortcut != "": if shortcut != "":
labelsc = label + "|" + shortcut labelsc = label + "|" + shortcut
if label != "": if label != "":
print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(input_files[0], base), lineno+1, label) (relativePath(input_files[0], base), lineno+1, label), file=output)
if labelsc != "": if labelsc != "":
print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(input_files[0], base), lineno+1, labelsc) (relativePath(input_files[0], base), lineno+1, labelsc), file=output)
input.close() input.close()
output.close() output.close()
@ -584,11 +584,11 @@ def encodings_l10n(input_files, output, base):
if not line.startswith('Encoding'): if not line.startswith('Encoding'):
continue continue
if reg.match(line): if reg.match(line):
print >> output, '#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \ print('#: %s:%d\nmsgid "%s"\nmsgstr ""\n' % \
(relativePath(input_files[0], base), lineno+1, reg.match(line).groups()[0]) (relativePath(input_files[0], base), lineno+1, reg.match(line).groups()[0]), file=output)
else: else:
print "Error: Unable to handle line:" print("Error: Unable to handle line:")
print line print(line)
# No need to abort if the parsing fails # No need to abort if the parsing fails
# sys.exit(1) # sys.exit(1)
input.close() input.close()
@ -628,7 +628,7 @@ if __name__ == '__main__':
['help', 'type=', 'output=', 'base=', 'src_file=']) ['help', 'type=', 'output=', 'base=', 'src_file='])
for (opt, value) in optlist: for (opt, value) in optlist:
if opt in ['-h', '--help']: if opt in ['-h', '--help']:
print Usage print(Usage)
sys.exit(0) sys.exit(0)
elif opt in ['-o', '--output']: elif opt in ['-o', '--output']:
output = value output = value
@ -640,7 +640,7 @@ if __name__ == '__main__':
input_files = [f.strip() for f in open(value)] input_files = [f.strip() for f in open(value)]
if input_type not in ['ui', 'layouts', 'layouttranslations', 'qt4', 'languages', 'latexfonts', 'encodings', 'external', 'formats'] or output is None: 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.' print('Wrong input type or output filename.')
sys.exit(1) sys.exit(1)
input_files += args input_files += args

7
po/postats.py
View File

@ -26,6 +26,7 @@ and generates a PHP web page.
Invocation: Invocation:
postats.py lyx_version po_files > "pathToWebPages"/i18n.inc postats.py lyx_version po_files > "pathToWebPages"/i18n.inc
""" """
from __future__ import print_function
# modify this when you change branch # modify this when you change branch
# Note that an empty lyx_branch variable (ie svn trunk) # Note that an empty lyx_branch variable (ie svn trunk)
@ -93,7 +94,7 @@ def run_msgfmt(pofile):
The function runs msgfmt on it and returns corresponding php code. The function runs msgfmt on it and returns corresponding php code.
""" """
if not pofile.endswith('.po'): if not pofile.endswith('.po'):
print >> sys.stderr, "%s is not a po file" % pofile print("%s is not a po file" % pofile, file=sys.stderr)
sys.exit(1) sys.exit(1)
dirname = os.path.dirname(pofile) dirname = os.path.dirname(pofile)
@ -132,7 +133,7 @@ if __name__ == "__main__":
branch_tag = "master" branch_tag = "master"
print """<?php print("""<?php
// The current version // The current version
$lyx_version = "%s"; $lyx_version = "%s";
// The branch tag // The branch tag
@ -140,4 +141,4 @@ $branch_tag = "%s";
// The data itself // The data itself
$podata = array (%s $podata = array (%s
)?>""" % (sys.argv[1], branch_tag, ",".join([run_msgfmt(po) for po in sys.argv[2:] if po not in ommitted])) )?>""" % (sys.argv[1], branch_tag, ",".join([run_msgfmt(po) for po in sys.argv[2:] if po not in ommitted])))