projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92677da
)
Ensure Qt translator does always get loaded.
author
Daniel Molkentin
<danimo@owncloud.com>
Mon, 4 Jan 2016 10:47:11 +0000
(11:47 +0100)
committer
Daniel Molkentin
<danimo@owncloud.com>
Mon, 4 Jan 2016 10:50:00 +0000
(11:50 +0100)
src/gui/application.cpp
patch
|
blob
|
history
diff --git
a/src/gui/application.cpp
b/src/gui/application.cpp
index 7f56379727ddfabc07294405d38be396c76ec38e..01248294089f4e7ef6ba7eb07856fec0ed274a45 100644
(file)
--- a/
src/gui/application.cpp
+++ b/
src/gui/application.cpp
@@
-545,7
+545,9
@@
void Application::setupTranslations()
const QString qtBaseTrFile = QLatin1String("qtbase_") + lang;
if (!qtTranslator->load(qtTrFile, qtTrPath)) {
if (!qtTranslator->load(qtTrFile, trPath)) {
- qtTranslator->load(qtBaseTrFile, trPath);
+ if (!qtTranslator->load(qtBaseTrFile, qtTrPath)) {
+ qtTranslator->load(qtBaseTrFile, trPath);
+ }
}
}
const QString qtkeychainTrFile = QLatin1String("qtkeychain_") + lang;