From 93ae44e214699b8c2b54fa64c2e48436b479dd35 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 10 Dec 2019 22:33:54 +0000 Subject: [PATCH] [libcalamares] Split translatable timezone data - Hide the one file from lupdate by giving it a weird suffix - Call lupdate a second time for the timezone translations - While here, adjust so that the options precede the directories they are supposed to affect I don't want to give the translation teams 444 new strings all at once (about 90% of which don't need translation). --- .tx/config | 6 ++++++ ci/txpush.sh | 4 +++- .../locale/{ZoneData_p.cpp => ZoneData_p.cxxtr} | 0 3 files changed, 9 insertions(+), 1 deletion(-) rename src/libcalamares/locale/{ZoneData_p.cpp => ZoneData_p.cxxtr} (100%) diff --git a/.tx/config b/.tx/config index 3cf9489f6..cdae01013 100644 --- a/.tx/config +++ b/.tx/config @@ -7,6 +7,12 @@ source_file = lang/calamares_en.ts source_lang = en type = QT +[calamares.tz] +file_filter = lang/tz_.ts +source_file = lang/tz_en.ts +source_lang = en +type = QT + [calamares.dummypythonqt] file_filter = src/modules/dummypythonqt/lang//LC_MESSAGES/dummypythonqt.po source_file = src/modules/dummypythonqt/lang/dummypythonqt.pot diff --git a/ci/txpush.sh b/ci/txpush.sh index 04e49921d..954e0b4b1 100755 --- a/ci/txpush.sh +++ b/ci/txpush.sh @@ -56,9 +56,11 @@ lupdate -version > /dev/null 2>&1 || { echo "! No working lupdate" ; lupdate -ve # Don't pull branding translations in, # those are done separately. _srcdirs="src/calamares src/libcalamares src/libcalamaresui src/modules src/qml" -lupdate $_srcdirs -ts -no-obsolete lang/calamares_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 tx push --source --no-interactive -r calamares.fdo ### PYTHON MODULES diff --git a/src/libcalamares/locale/ZoneData_p.cpp b/src/libcalamares/locale/ZoneData_p.cxxtr similarity index 100% rename from src/libcalamares/locale/ZoneData_p.cpp rename to src/libcalamares/locale/ZoneData_p.cxxtr