rbutil: Cleanly handle translation loading errors at runtime
rockbox-gerrit-noreply--- via rockbox-cvs <[email protected]> Sat, 27 Jun 2026 07:29:37 -0400
| Newsgroups | gmane.comp.systems.archos.rockbox.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 4875f706c26cf9ec400069b77b5f0a270768aa5b Author: Solomon Peachy <[email protected]> Date: Sat Jun 27 07:28:10 2026 -0400 rbutil: Cleanly handle translation loading errors at runtime Change-Id: I2d8c566437b9a6224db41608bf3cbab8aed76763 diff --git a/utils/rbutilqt/configure.cpp b/utils/rbutilqt/configure.cpp index 2d4f3a62bc..a8bc2e49aa 100644 --- a/utils/rbutilqt/configure.cpp +++ b/utils/rbutilqt/configure.cpp @@ -581,7 +581,10 @@ QString Config::languageName(const QString &qmFile) QString file = "rbutil_" + qmFile; if(!translator.load(file, programPath)) - translator.load(file, ":/lang"); + if (!translator.load(file, ":/lang")) { + LOG_ERROR() << "Failed to load translation:" << file; + return ("Failed to load translation:" + file); + } return translator.translate("Configure", "English", "This is the localized language name, i.e. your language."); @@ -608,10 +611,16 @@ void Config::updateLanguage() QString absolutePath = QCoreApplication::instance()->applicationDirPath(); if(!translator->load("rbutil_" + language, absolutePath)) - translator->load("rbutil_" + language, ":/lang"); + if (!translator->load("rbutil_" + language, ":/lang")) { + LOG_ERROR() << "Failed to load translation:" << ("rbutil_" + language); + return; + } if(!qttrans->load("qt_" + language, QLibraryInfo::path(QLibraryInfo::TranslationsPath))) - qttrans->load("qt_" + language, ":/lang"); + if (!qttrans->load("qt_" + language, ":/lang")) { + LOG_ERROR() << "Failed to load translation:" << ("qt_" + language); + return; + } qApp->installTranslator(translator); qApp->installTranslator(qttrans); -- rockbox-cvs mailing list [email protected] https://lists.haxx.se/mailman/listinfo/rockbox-cvs