From c6a60132730d272c08ff3adf78f4bb04ab1020f5 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 13 Oct 2017 12:38:19 +0200 Subject: [PATCH] Load new Qt translations, new flags. --- resources/binaries | 2 +- resources/graphics/misc/flags/es.png | Bin 0 -> 1397 bytes resources/graphics/misc/flags/pt.png | Bin 2549 -> 1797 bytes resources/rssguard.qrc | 21 +++++++++++++++++++++ src/miscellaneous/localization.cpp | 9 +++++++++ 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100755 resources/graphics/misc/flags/es.png diff --git a/resources/binaries b/resources/binaries index ae7084718..4a01edaec 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit ae7084718c41afc01919779e58cd449e0eebd401 +Subproject commit 4a01edaec7d67d3b2ae81aeea2a3c876216fbab8 diff --git a/resources/graphics/misc/flags/es.png b/resources/graphics/misc/flags/es.png new file mode 100755 index 0000000000000000000000000000000000000000..38b66bc4a8fe8ad91f74a0ee1ffdcba9b5f25718 GIT binary patch literal 1397 zcmV-*1&aEKP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ=`$P!}fd(3K05N;Cv?L5xA8F%oeDf&xlyLqD16e7ui)kBj%_qr(i8Vv!en zl9M;R@7~+J@;KDBE(rNVlFEHRsj6p0Vp5=IMFjsq5;!OQWHwB@!*lEsG%wyDL>^ zN2Px>x7J`nTSEZaAfAW#ev^Ny8Vr*r?-VVTtqHisc3RBYTEz3hMXv$S;CbM=@dyCV ztFpxosV5lE!+3sd091<5st3gNLf5qPTZ7kIwcQ7ivKO+Z0$}i@hC~UZyp-wgKMIu$ z0d!V8AR0^=#9f@hQ2|nR9j;tU@yM`;ZAD{^x<3GNpp5{e)S5yH0w01&Xz!cBauoAoV3SQUF->mRhOudS(-sK@ zb5lYlBiMGclrAmyg1fCj>-PbI5CCrTz7AYJ55Ih*+548o;LA`v<52iru*Nms`ZiYY zhTg4ZuKXBq_G81&LlzsJ0+u5)i%@ZK1i*mgT2s@5haOYpk9J_E3rrmWo$yGX_vkwE z2H6eUDP6qGT-v2?=v_u$>7;+C2!Y&bQ(dCCQLRnuu(!05H0C;%ZbaSWber=dUq0aSZJn0uRsu%JE5W&SKA%=@>WYgoXIC z6pHVW-B*ZMAj_asO9`t&p_;oJRA~^4ufE^U=-B}-k3Eeu9d zy^Vnb9_Oy?;fwDEIeYF!Nci^<1GneCF?wMP)B>jo-;81F#vhn3XUL|<=-C08EeQ&$ zgk3yE-<~v%5t2QM!9Oq2_QW*V&Z(%dGs_SIrn=|~*zDfuxsXbl<~#8NDGr`*;q*;E zYE|8#)S{w)IWo%KZxL!Cg|4nQv?VO0B(VUY+M%rLiaF6H{ID3K%MOVEgcK69ND4hD zUvyPyb1jX=@0zJ%vsL@@r()y)Rb_k412LtL9c>FCn$FJHQK@>opUvmuctxNU&<|_@ zdShn%B=Bo=WT!KF#z|ZtuU2mAR{*R4SOM^#%0B}DL-*vjz;Xam00000NkvXXu0mjf Dd9RAw literal 0 HcmV?d00001 diff --git a/resources/graphics/misc/flags/pt.png b/resources/graphics/misc/flags/pt.png index 47a007f2dfe23c5a3296447c0b5a136b3f81fe3b..5b3907313b62ed5750ff9fd55dad3833b657b1b6 100644 GIT binary patch delta 1717 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 diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc index 9271ab176..9416e1a28 100755 --- a/resources/rssguard.qrc +++ b/resources/rssguard.qrc @@ -40,6 +40,7 @@ graphics/misc/flags/de.png graphics/misc/flags/en.png graphics/misc/flags/en_GB.png + graphics/misc/flags/es.png graphics/misc/flags/fr.png graphics/misc/flags/he.png graphics/misc/flags/id.png @@ -1555,5 +1556,25 @@ localizations/rssguard_zh.qm desktop/rssguard.desktop desktop/rssguard.desktop.autostart + localizations/qt_bg.qm + localizations/qt_ca.qm + localizations/qt_cs.qm + localizations/qt_da.qm + localizations/qt_de.qm + localizations/qt_en.qm + localizations/qt_es.qm + localizations/qt_fi.qm + localizations/qt_fr.qm + localizations/qt_gd.qm + localizations/qt_he.qm + localizations/qt_hu.qm + localizations/qt_it.qm + localizations/qt_ja.qm + localizations/qt_ko.qm + localizations/qt_lv.qm + localizations/qt_pl.qm + localizations/qt_ru.qm + localizations/qt_sk.qm + localizations/qt_uk.qm diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp index ce72704ba..0d23f225c 100755 --- a/src/miscellaneous/localization.cpp +++ b/src/miscellaneous/localization.cpp @@ -35,6 +35,7 @@ QString Localization::desiredLanguage() const { } void Localization::loadActiveLanguage() { + QTranslator* qt_translator = new QTranslator(qApp); QTranslator* app_translator = new QTranslator(qApp); QString desired_localization = desiredLanguage(); @@ -56,6 +57,14 @@ void Localization::loadActiveLanguage() { desired_localization = DEFAULT_LOCALE; } + if (qt_translator->load(QLocale(desired_localization), "qt", QSL("_"), APP_LANG_PATH)) { + Application::installTranslator(qt_translator); + qDebug("Qt localization '%s' loaded successfully.", qPrintable(desired_localization)); + } + else { + qWarning("Qt localization '%s' was not loaded.", qPrintable(desired_localization)); + } + m_loadedLanguage = desired_localization; m_loadedLocale = QLocale(desired_localization); QLocale::setDefault(m_loadedLocale);