From 943f965f59208c8562d24e23b9142e194e6a0de4 Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 28 Apr 2021 22:45:11 +0200 Subject: [PATCH] Fix Transifex - More verbose output - add "stable" parameter to sort - add LC_ALL=C parameter --- .github/workflows/transifex.yml | 3 ++- bin/run_xgettext.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml index b56ae395f..b775b0844 100644 --- a/.github/workflows/transifex.yml +++ b/.github/workflows/transifex.yml @@ -20,8 +20,9 @@ jobs: echo "::group::Check messages.po" # Skip first 4 lines in possible diff, because they're header # Skip all lines of the git diff starting with "@@" or comments or starting "POT-Creation-Date" - if [[ $(git diff -U0 ./view/lang/C/messages.po | awk '!/@@|-"POT-Creation-Date|+"POT-Creation-Date|-#|+#/{print }' | wc -l) > 4 ]]; then + if [[ $(git diff -U0 ./view/lang/C/messages.po | awk '!/@@|-"POT-Creation-Date|+"POT-Creation-Date|-#|+#/{print }' | wc -l) -gt 4 ]]; then echo "::error file=messages.po::messages.po is out of date" + echo "$(git diff ./view/lang/C/messages.po)" exit 1 else echo "Nothing to update" diff --git a/bin/run_xgettext.sh b/bin/run_xgettext.sh index a2a7408dd..5392e0e15 100755 --- a/bin/run_xgettext.sh +++ b/bin/run_xgettext.sh @@ -61,7 +61,7 @@ KEYWORDS="-k -kt -ktt:1,2" echo "Extract strings to $OUTFILE.." rm "$OUTFILE"; touch "$OUTFILE" -find_result=$(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f | sort) +find_result=$(find "$FINDSTARTDIR" $FINDOPTS -name "*.php" -type f | LC_ALL=C sort --stable) total_files=$(wc -l <<< "${find_result}")