From: Georg Baum <baum@lyx.org>
Date: Sat, 4 Jun 2016 17:21:06 +0000 (+0200)
Subject: Get rid of pseudo diffs when remerging strings
X-Git-Tag: 2.2.1~173
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8423db037a3828d58aa896c16a954c2352434538;p=features.git

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.
---

diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 500185fdba..783d13fefb 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -651,6 +651,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':