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

Always use unix line ends in .pot files

Browse Source 
Otherwise gettext creates files with stray '\r' in comment lines on windows.
This commit is contained in:
Georg Baum 2016-05-08 22:08:17 +02:00 committed by Richard Heck
parent 78d6c2f331
commit ba6d84c917
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
po/lyx_pot.py
View File

@ -44,7 +44,7 @@ def writeString(outfile, infile, basefile, lineno, string):
def ui_l10n(input_files, output, base): def ui_l10n(input_files, output, base):
'''Generate pot file from lib/ui/*''' '''Generate pot file from lib/ui/*'''
output = io.open(output, 'w', encoding='utf_8') output = io.open(output, 'w', encoding='utf_8', newline='\n')
Submenu = re.compile(r'^[^#]*Submenu\s+"([^"]*)"', re.IGNORECASE) Submenu = re.compile(r'^[^#]*Submenu\s+"([^"]*)"', re.IGNORECASE)
Popupmenu = re.compile(r'^[^#]*PopupMenu\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE) Popupmenu = re.compile(r'^[^#]*PopupMenu\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
IconPalette = re.compile(r'^[^#]*IconPalette\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE) IconPalette = re.compile(r'^[^#]*IconPalette\s+"[^"]+"\s+"([^"]*)"', re.IGNORECASE)
@ -166,7 +166,10 @@ def layouts_l10n(input_files, output, base, layouttranslations):
if 'wa' in languages: if 'wa' in languages:
languages.remove('wa') languages.remove('wa')
out = io.open(output, 'w', encoding='utf_8') 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: for src in input_files:
readingDescription = False readingDescription = False
readingI18nPreamble = False readingI18nPreamble = False
@ -433,7 +436,7 @@ def layouts_l10n(input_files, output, base, layouttranslations):
def qt4_l10n(input_files, output, base): def qt4_l10n(input_files, output, base):
'''Generate pot file from src/frontends/qt4/ui/*.ui''' '''Generate pot file from src/frontends/qt4/ui/*.ui'''
output = io.open(output, 'w', encoding='utf_8') output = io.open(output, 'w', encoding='utf_8', newline='\n')
pat = re.compile(r'\s*<string>(.*)</string>') pat = re.compile(r'\s*<string>(.*)</string>')
prop = re.compile(r'\s*<property.*name.*=.*shortcut') prop = re.compile(r'\s*<property.*name.*=.*shortcut')
for src in input_files: for src in input_files:
@ -462,7 +465,7 @@ def qt4_l10n(input_files, output, base):
def languages_l10n(input_files, output, base): def languages_l10n(input_files, output, base):
'''Generate pot file from lib/languages''' '''Generate pot file from lib/languages'''
out = io.open(output, 'w', encoding='utf_8') out = io.open(output, 'w', encoding='utf_8', newline='\n')
GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE) GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
for src in input_files: for src in input_files:
@ -482,7 +485,7 @@ def languages_l10n(input_files, output, base):
def latexfonts_l10n(input_files, output, base): def latexfonts_l10n(input_files, output, base):
'''Generate pot file from lib/latexfonts''' '''Generate pot file from lib/latexfonts'''
out = io.open(output, 'w', encoding='utf_8') out = io.open(output, 'w', encoding='utf_8', newline='\n')
GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE) GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
for src in input_files: for src in input_files:
@ -502,7 +505,7 @@ def latexfonts_l10n(input_files, output, base):
def external_l10n(input_files, output, base): def external_l10n(input_files, output, base):
'''Generate pot file from lib/external_templates''' '''Generate pot file from lib/external_templates'''
output = io.open(output, 'w', encoding='utf_8') output = io.open(output, 'w', encoding='utf_8', newline='\n')
Template = re.compile(r'^Template\s+(.*)', re.IGNORECASE) Template = re.compile(r'^Template\s+(.*)', re.IGNORECASE)
GuiName = re.compile(r'\s*GuiName\s+(.*)', re.IGNORECASE) GuiName = re.compile(r'\s*GuiName\s+(.*)', re.IGNORECASE)
HelpTextStart = re.compile(r'\s*HelpText\s', re.IGNORECASE) HelpTextStart = re.compile(r'\s*HelpText\s', re.IGNORECASE)
@ -551,7 +554,7 @@ def external_l10n(input_files, output, base):
def formats_l10n(input_files, output, base): def formats_l10n(input_files, output, base):
'''Generate pot file from configure.py''' '''Generate pot file from configure.py'''
output = io.open(output, 'w', encoding='utf_8') 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) 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) GuiName2 = re.compile(r'.*\\Format\s+\S+\s+\S+\s+([^"]\S+)\s+(\S*)\s+.*', re.IGNORECASE)
input = io.open(input_files[0], encoding='utf_8') input = io.open(input_files[0], encoding='utf_8')
@ -581,7 +584,7 @@ def formats_l10n(input_files, output, base):
def encodings_l10n(input_files, output, base): def encodings_l10n(input_files, output, base):
'''Generate pot file from lib/encodings''' '''Generate pot file from lib/encodings'''
output = io.open(output, 'w', encoding='utf_8') output = io.open(output, 'w', encoding='utf_8', newline='\n')
# assuming only one encodings file # assuming only one encodings file
# Encoding utf8 utf8 "Unicode (utf8)" UTF-8 variable inputenc # 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+.*')