mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Get rid of pseudo diffs when remerging strings
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:
parent
bf60696ee6
commit
960bcc71c1
@ -654,6 +654,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':
|
||||
|
Loading…
Reference in New Issue
Block a user