diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-03-17 22:39:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 22:39:11 +0300 |
| commit | a188c078eb948a30accb106a5d8737e89b064b93 (patch) | |
| tree | 1808d297a6fd1b385c5c4c9d1447b3e69a8ff767 | |
| parent | 266eeb4fdf8c197ef9cb864cb8772083e20f0cbf (diff) | |
| parent | 670808e730ea6434f840ee1fa49672f4225bd753 (diff) | |
Merge pull request #4869: FIX(client): Qt translations not found
Commit 0dcc1f6 changed the used
function for loading translation files. The new overload requires an
extra parameter when specifying the directory in which to search for
translation files. This was not provided though and thus the provided
directory path was mis-interpreted as something else.
Fixes #4856
| -rw-r--r-- | src/mumble/Translations.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mumble/Translations.cpp b/src/mumble/Translations.cpp index 90ae8b1e9..377732c23 100644 --- a/src/mumble/Translations.cpp +++ b/src/mumble/Translations.cpp @@ -121,9 +121,9 @@ namespace Translations { app.installTranslator(guard.m_qtTranslator); } else if (guard.m_qtTranslator->load(locale, ":/mumble_overwrite_qtbase_")) { app.installTranslator(guard.m_qtTranslator); - } else if (guard.m_qtTranslator->load(locale, "qt_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + } else if (guard.m_qtTranslator->load(locale, "qt_", prefix, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { app.installTranslator(guard.m_qtTranslator); - } else if (guard.m_qtTranslator->load(locale, "qtbase_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { + } else if (guard.m_qtTranslator->load(locale, "qtbase_", prefix, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { app.installTranslator(guard.m_qtTranslator); } else if (guard.m_qtTranslator->load(locale, ":/qt_")) { app.installTranslator(guard.m_qtTranslator); |