From 5dad5dae02980d3c7da8b33dd11aeaf8f35a6fa5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 25 Jan 2020 15:48:08 +0100 Subject: [PATCH] i18n: support Tumbleweed versioned-lupdate executables --- ci/txpush.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ci/txpush.sh b/ci/txpush.sh index fa0f36a3f..930b7ebc2 100755 --- a/ci/txpush.sh +++ b/ci/txpush.sh @@ -50,15 +50,22 @@ fi # Use local tools (depending on type of source) to create translation # sources, then push to Transifex -export QT_SELECT=5 -lupdate -version > /dev/null 2>&1 || export QT_SELECT=qt5 -lupdate -version > /dev/null 2>&1 || { echo "! No working lupdate" ; lupdate -version ; exit 1 ; } +LUPDATE="" +for _lupdate in lupdate lupdate-qt5 +do + export QT_SELECT=5 + $_lupdate -version > /dev/null 2>&1 || export QT_SELECT=qt5 + $_lupdate -version > /dev/null 2>&1 && LUPDATE=$_lupdate + test -n "$LUPDATE" && break +done + +test -n "$LUPDATE" || { echo "! No working lupdate" ; lupdate -version ; exit 1 ; } # Don't pull branding translations in, # those are done separately. _srcdirs="src/calamares src/libcalamares src/libcalamaresui src/modules src/qml" -lupdate -no-obsolete $_srcdirs -ts lang/calamares_en.ts -lupdate -no-obsolete -extensions cxxtr src/libcalamares/locale -ts lang/tz_en.ts +$LUPDATE -no-obsolete $_srcdirs -ts lang/calamares_en.ts +$LUPDATE -no-obsolete -extensions cxxtr src/libcalamares/locale -ts lang/tz_en.ts tx push --source --no-interactive -r calamares.calamares-master tx push --source --no-interactive -r calamares.tz