diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-25 17:27:21 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 17:09:21 +0000 |
commit | aabb833032fa44c7f359bea40ee8e1ffa743668f (patch) | |
tree | f695ace36f14c774b995bb62382ebe97ed69164b /translations/translations.pro | |
parent | 334346689eb87065849de0cbae70c77359da0bdf (diff) | |
download | qttranslations-aabb833032fa44c7f359bea40ee8e1ffa743668f.tar.gz |
Add English translations
Automatically generate empty _en.qm files. This allows the user to
use the QTranslator::load(QLocale) overload, e.g.
translator.load(QLocale(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
So far this has been using a non-English translation even if English
has a higher priority (for instance by setting LANGUAGE=en:de on Linux).
[ChangeLog][Translations] Qt modules now include an English translation
(_en.qm) file. This fixes the behavior of QTranslator::load(QLocale) if
English is just one of the configured languages.
Change-Id: Ibb9e721ef501fbf5cb231671e3b89ef27a68f0a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'translations/translations.pro')
-rw-r--r-- | translations/translations.pro | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index a88e267..738d04c 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -1,7 +1,5 @@ TEMPLATE = aux -TRANSLATIONS = $$files(*.ts) - load(qt_build_paths) qtPrepareTool(LRELEASE, lrelease) @@ -26,6 +24,8 @@ defineTest(addTsTarget) { export(TS_TARGETS) } +TS_MODULES = + # target basename, project files defineTest(addTsTargets) { files = $$files($$PWD/$${1}_??.ts) $$files($$PWD/$${1}_??_??.ts) @@ -35,6 +35,8 @@ defineTest(addTsTargets) { } addTsTarget(ts-untranslated, ts-$$1-untranslated, $$2, $$PWD/$${1}_untranslated.ts) addTsTarget(ts-all, ts-$$1-all, $$2, $$PWD/$${1}_untranslated.ts $$files) + TS_MODULES += $$1 + export(TS_MODULES) } addTsTargets(qtbase, qtbase/src/src.pro \ @@ -105,6 +107,16 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += updateqm +# generate empty _en.ts files +empty_ts = "<TS></TS>" +for (module_name, TS_MODULES) { + write_file($$OUT_PWD/$${module_name}_en.ts, empty_ts)|error("Aborting.") +} +write_file($$OUT_PWD/qt_en.ts, empty_ts)|error("Aborting.") + +TRANSLATIONS = $$files(*.ts) +!isEqual(OUT_PWD, $$PWD): TRANSLATIONS += $$files($$OUT_PWD/*.ts) + translations.path = $$[QT_INSTALL_TRANSLATIONS] translations.files = $$TRANSLATIONS translations.files ~= s,\\.ts$,.qm,g |