Remove Qt translations, now rely on system ones.
This commit is contained in:
parent
952889a863
commit
0e22eaf3b9
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
8
resources/rssguard.qrc
Normal file → Executable file
8
resources/rssguard.qrc
Normal file → Executable file
@ -1553,14 +1553,6 @@
|
||||
<file>localizations/rssguard_pt.qm</file>
|
||||
<file>localizations/rssguard_sv.qm</file>
|
||||
<file>localizations/rssguard_zh.qm</file>
|
||||
<file>localizations/qtbase_cs.qm</file>
|
||||
<file>localizations/qtbase_da.qm</file>
|
||||
<file>localizations/qtbase_de.qm</file>
|
||||
<file>localizations/qtbase_fr.qm</file>
|
||||
<file>localizations/qtbase_he.qm</file>
|
||||
<file>localizations/qtbase_it.qm</file>
|
||||
<file>localizations/qtbase_ja.qm</file>
|
||||
<file>localizations/qtbase_sv.qm</file>
|
||||
<file>desktop/rssguard.desktop</file>
|
||||
<file>desktop/rssguard.desktop.autostart</file>
|
||||
</qresource>
|
||||
|
62
rssguard.pro
62
rssguard.pro
@ -570,49 +570,23 @@ else {
|
||||
src/gui/newspaperpreviewer.ui
|
||||
}
|
||||
|
||||
TRANSLATIONS += localization/qtbase_cs.ts \
|
||||
localization/qtbase_da.ts \
|
||||
localization/qtbase_de.ts \
|
||||
localization/qtbase_fr.ts \
|
||||
localization/qtbase_he.ts \
|
||||
localization/qtbase_it.ts \
|
||||
localization/qtbase_ja.ts \
|
||||
localization/qtbase_sv.ts \
|
||||
localization/rssguard_cs.ts \
|
||||
localization/rssguard_da.ts \
|
||||
localization/rssguard_de.ts \
|
||||
localization/rssguard_en_GB.ts \
|
||||
localization/rssguard_en.ts \
|
||||
localization/rssguard_es.ts \
|
||||
localization/rssguard_fr.ts \
|
||||
localization/rssguard_he.ts \
|
||||
localization/rssguard_id.ts \
|
||||
localization/rssguard_it.ts \
|
||||
localization/rssguard_ja.ts \
|
||||
localization/rssguard_lt.ts \
|
||||
localization/rssguard_nl.ts \
|
||||
localization/rssguard_pl.ts \
|
||||
localization/rssguard_pt.ts \
|
||||
localization/rssguard_sv.ts \
|
||||
localization/rssguard_zh.ts
|
||||
|
||||
TRANSLATIONS_WO_QT += $$PWD/localization/rssguard_cs.ts \
|
||||
$$PWD/localization/rssguard_da.ts \
|
||||
$$PWD/localization/rssguard_de.ts \
|
||||
$$PWD/localization/rssguard_en_GB.ts \
|
||||
$$PWD/localization/rssguard_en.ts \
|
||||
$$PWD/localization/rssguard_es.ts \
|
||||
$$PWD/localization/rssguard_fr.ts \
|
||||
$$PWD/localization/rssguard_he.ts \
|
||||
$$PWD/localization/rssguard_id.ts \
|
||||
$$PWD/localization/rssguard_it.ts \
|
||||
$$PWD/localization/rssguard_ja.ts \
|
||||
$$PWD/localization/rssguard_lt.ts \
|
||||
$$PWD/localization/rssguard_nl.ts \
|
||||
$$PWD/localization/rssguard_pl.ts \
|
||||
$$PWD/localization/rssguard_pt.ts \
|
||||
$$PWD/localization/rssguard_sv.ts \
|
||||
$$PWD/localization/rssguard_zh.ts
|
||||
TRANSLATIONS += $$PWD/localization/rssguard_cs.ts \
|
||||
$$PWD/localization/rssguard_da.ts \
|
||||
$$PWD/localization/rssguard_de.ts \
|
||||
$$PWD/localization/rssguard_en_GB.ts \
|
||||
$$PWD/localization/rssguard_en.ts \
|
||||
$$PWD/localization/rssguard_es.ts \
|
||||
$$PWD/localization/rssguard_fr.ts \
|
||||
$$PWD/localization/rssguard_he.ts \
|
||||
$$PWD/localization/rssguard_id.ts \
|
||||
$$PWD/localization/rssguard_it.ts \
|
||||
$$PWD/localization/rssguard_ja.ts \
|
||||
$$PWD/localization/rssguard_lt.ts \
|
||||
$$PWD/localization/rssguard_nl.ts \
|
||||
$$PWD/localization/rssguard_pl.ts \
|
||||
$$PWD/localization/rssguard_pt.ts \
|
||||
$$PWD/localization/rssguard_sv.ts \
|
||||
$$PWD/localization/rssguard_zh.ts
|
||||
|
||||
INCLUDEPATH += $$PWD/. \
|
||||
$$PWD/src \
|
||||
@ -628,7 +602,7 @@ lrelease.CONFIG += no_link target_predeps
|
||||
|
||||
# Create new "make lupdate" target.
|
||||
lupdate.target = lupdate
|
||||
lupdate.commands = lupdate $$shell_path($$PWD/rssguard.pro) -ts $$shell_path($$TRANSLATIONS_WO_QT)
|
||||
lupdate.commands = lupdate $$shell_path($$PWD/rssguard.pro) -ts $$shell_path($$TRANSLATIONS)
|
||||
|
||||
QMAKE_EXTRA_TARGETS += lupdate
|
||||
QMAKE_EXTRA_COMPILERS += lrelease
|
||||
|
@ -54,5 +54,8 @@ void GuiUtilities::applyResponsiveDialogResize(QWidget& widget, double factor) {
|
||||
int heig = widt * ratio;
|
||||
|
||||
widget.resize(widt, heig);
|
||||
#else
|
||||
Q_UNUSED(factor)
|
||||
Q_UNUSED(widget)
|
||||
#endif
|
||||
}
|
||||
|
@ -35,7 +35,6 @@ QString Localization::desiredLanguage() const {
|
||||
}
|
||||
|
||||
void Localization::loadActiveLanguage() {
|
||||
QTranslator* qt_translator = new QTranslator(qApp);
|
||||
QTranslator* app_translator = new QTranslator(qApp);
|
||||
QString desired_localization = desiredLanguage();
|
||||
|
||||
@ -57,14 +56,6 @@ void Localization::loadActiveLanguage() {
|
||||
desired_localization = DEFAULT_LOCALE;
|
||||
}
|
||||
|
||||
if (qt_translator->load(QLocale(desired_localization), "qtbase", 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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user