diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-08-30 16:33:48 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-30 16:18:43 +0000 |
commit | a2fdf1732f03a54102a667cb5f9d809ba48fe4c5 (patch) | |
tree | b250ff7b2694ed2fa18ebef49b81e7d40b32a9fc | |
parent | e07858ad252c69bc412a7368df02ee16d138c897 (diff) |
Linguist examples: Fix translator loading code
Adapt to qtbase/74515a7a30b809a3ab0a2d67496e870ea3c872e6.
Change-Id: I089970f5e2a7f16ba470aaf4d9e7f1fc9c3e50fd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit d1c6224b2dcbda65ae7588271423dcb335fa7c6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | examples/linguist/arrowpad/main.cpp | 6 | ||||
-rw-r--r-- | examples/linguist/trollprint/main.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/linguist/arrowpad/main.cpp b/examples/linguist/arrowpad/main.cpp index 68c4918fd..d25c11959 100644 --- a/examples/linguist/arrowpad/main.cpp +++ b/examples/linguist/arrowpad/main.cpp @@ -58,13 +58,13 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QString locale = QLocale::system().name(); + auto locale = QLocale::system(); //! [2] QTranslator translator; //! [2] //! [3] - translator.load(QString("arrowpad_") + locale); - app.installTranslator(&translator); + if (translator.load(locale, u"arrowpad"_qs, u"_"_qs)) + app.installTranslator(&translator); //! [1] //! [3] MainWindow mainWindow; diff --git a/examples/linguist/trollprint/main.cpp b/examples/linguist/trollprint/main.cpp index dea3748f5..e334a2bc5 100644 --- a/examples/linguist/trollprint/main.cpp +++ b/examples/linguist/trollprint/main.cpp @@ -56,12 +56,12 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QString locale = QLocale::system().name(); + auto locale = QLocale::system(); //! [0] QTranslator translator; - translator.load(QString("trollprint_") + locale); - app.installTranslator(&translator); + if (translator.load(locale, u"trollprint"_qs, u"_"_qs)) + app.installTranslator(&translator); //! [0] MainWindow mainWindow; |