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

Get rid of pseudo diffs when remerging strings

Browse Source 
cmake sorts the input files for lyx_pot.py internally, but autotools use a
shell pattern like *.ui on the command line, so the order may be different
on different machines. It is more robust not to require any sorting from the
caller, so lyx_pot.py sorts now internally.
This commit is contained in:
Georg Baum 2016-06-04 19:21:06 +02:00
parent 6c3849b4c7
commit 8423db037a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
po/lyx_pot.py
View File

@ -651,6 +651,13 @@ if __name__ == '__main__':
input_files += args 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': if input_type == 'ui':
ui_l10n(input_files, output, base) ui_l10n(input_files, output, base)
elif input_type == 'latexfonts': elif input_type == 'latexfonts':