common: Fix translation loading, use all paths #606
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix non-macOS usage of QTranslator to specify the directory properly, instead of treating it as the prefix. Continue to search via filename instead of prefix. Fixes loading Qt (not Quassel) translations on Ubuntu 20.04 LTS. See: https://doc.qt.io/qt-5/qtranslator.html#load-1 Versus: https://doc.qt.io/qt-5/qtranslator.html#load Load translations from all available translation data directories, not just the first one found. Always include the internal resource when present. NOTE: This removes the ability to disable translations by creating an empty directory. The "C" locale should be specified to specifically disable translation. Fixes failure to load translations on Windows due to Qt translations being installed in the Quassel data directory, separate from the internal bundled Quassel translations.
digitalcircuit
force-pushed
the
fix-qt-win-trans
branch
from
55a75c3
to
b119caa
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In short
QTranslatorloading Qt translations on Linuxdirectoryinload(), not asprefix:/i18n/)Details
As of 0.14.0, the Windows installer for Quassel places the Qt translations into
C:\Program Files\Quassel IRC\translationsfolder, while Quassel's own translations are bundled internally in:/i18n/.Before this change, Quassel would only try to load translations from one possible data path, missing the bundled translations in
:/i18n/.After this change, Quassel tries to load translations from all available data paths, including the bundled translations when present.
Testing
Steps
Windows.zipartifact from GitHub ActionsSettings→Configure Quassel…Language:drop-down, check that expected languages are presentBefore
Linux
Qt translations fail to load according to the
falsereturn status ofqtTranslator->load(…)withQLibraryInfo::location(QLibraryInfo::TranslationsPath).Windows
All translations fail to load.
The
Language:setting in the configuration window displays<Untranslated>,<System Default>, andCas the only options.After
Linux
Qt translations successfully load according to the
truereturn status ofqtTranslator->load(…)withQLibraryInfo::location(QLibraryInfo::TranslationsPath).NOTE: For unknown reasons, even when Qt claims the translation loaded successfully, system strings (e.g. the
Cancelbutton) does not get translated. Quassel's strings change successfully. This is not a regression as the same issue happens on themasterbranch.Windows
Translations load and apply to both Quassel's strings and Qt's system strings (e.g. the
Cancelbutton).The
Language:setting in the configuration window displays all the expected language options.The
Debug Logwindow now prints the following debug message: