1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i18n example: No longer ignore return value of QTranslator.load()

Browse Source 
Adapt to qtbase/86ebe46f591d33dc76e2f764524c988dd72f4437.

Change-Id: Ie45d43b3eabe60195622d69458e3d881139f9ce1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Friedemann Kleint 2020-11-18 11:34:53 +01:00
parent dc54f5f420
commit d3ba1b321b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
examples/widgets/tools/i18n/languagechooser.cpp
View File

@ -129,8 +129,11 @@ void LanguageChooser::checkBoxToggled()
MainWindow *window = mainWindowForCheckBoxMap.value(checkBox); MainWindow *window = mainWindowForCheckBoxMap.value(checkBox);
if (!window) { if (!window) {
QTranslator translator; QTranslator translator;
translator.load(qmFileForCheckBoxMap.value(checkBox)); const QString qmlFile = qmFileForCheckBoxMap.value(checkBox);
qApp->installTranslator(&translator); if (translator.load(qmlFile))
QCoreApplication::installTranslator(&translator);
else
qWarning("Unable to load %s", qPrintable(QDir::toNativeSeparators(qmlFile)));
window = new MainWindow; window = new MainWindow;
window->setPalette(colorForLanguage(checkBox->text())); window->setPalette(colorForLanguage(checkBox->text()));
@ -166,8 +169,10 @@ QStringList LanguageChooser::findQmFiles()
QString LanguageChooser::languageName(const QString &qmFile) QString LanguageChooser::languageName(const QString &qmFile)
{ {
QTranslator translator; QTranslator translator;
translator.load(qmFile); if (!translator.load(qmFile)) {
qWarning("Unable to load %s", qPrintable(QDir::toNativeSeparators(qmFile)));
return {};
}
return translator.translate("MainWindow", "English"); return translator.translate("MainWindow", "English");
} }