From a8e844e88d5360a30a82d32e969ca3b1cf965bad Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 11 Aug 2023 10:17:32 +0200 Subject: [PATCH] fix UNREAD ARTICLES translation not showing --- .../miscellaneous/localization.cpp | 30 +++++-------------- .../services/abstract/unreadnode.cpp | 1 + .../services/abstract/unreadnode.h | 2 ++ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/librssguard/miscellaneous/localization.cpp b/src/librssguard/miscellaneous/localization.cpp index 4582aaa0a..a87c64929 100644 --- a/src/librssguard/miscellaneous/localization.cpp +++ b/src/librssguard/miscellaneous/localization.cpp @@ -9,8 +9,7 @@ #include #include -Localization::Localization(QObject* parent) - : QObject(parent) {} +Localization::Localization(QObject* parent) : QObject(parent) {} Localization::~Localization() = default; @@ -23,8 +22,7 @@ void Localization::loadActiveLanguage() { auto* app_translator = new QTranslator(qApp); QString desired_localization = desiredLanguage(); - qDebugNN << LOGSEC_CORE - << "Starting to load active localization. Desired localization is" + qDebugNN << LOGSEC_CORE << "Starting to load active localization. Desired localization is" << QUOTE_W_SPACE_DOT(desired_localization); if (app_translator->load(QLocale(desired_localization), QSL("rssguard"), QSL("_"), APP_LANG_PATH)) { @@ -32,21 +30,14 @@ void Localization::loadActiveLanguage() { QCoreApplication::installTranslator(app_translator); - qDebugNN << LOGSEC_CORE - << "Application localization" - << QUOTE_W_SPACE(desired_localization) - << "loaded successfully, specifically sublocalization" - << QUOTE_W_SPACE(real_loaded_locale) + qDebugNN << LOGSEC_CORE << "Application localization" << QUOTE_W_SPACE(desired_localization) + << "loaded successfully, specifically sublocalization" << QUOTE_W_SPACE(real_loaded_locale) << "was loaded."; desired_localization = real_loaded_locale; } else { - qWarningNN << LOGSEC_CORE - << "Application localization" - << QUOTE_W_SPACE(desired_localization) - << "was not loaded. Loading" - << QUOTE_W_SPACE(DEFAULT_LOCALE) - << "instead."; + qWarningNN << LOGSEC_CORE << "Application localization" << QUOTE_W_SPACE(desired_localization) + << "was not loaded. Loading" << QUOTE_W_SPACE(DEFAULT_LOCALE) << "instead."; desired_localization = QSL(DEFAULT_LOCALE); if (!app_translator->load(QLocale(desired_localization), QSL("rssguard"), QSL("_"), APP_LANG_PATH)) { @@ -59,15 +50,10 @@ void Localization::loadActiveLanguage() { if (qt_translator->load(QLocale(desired_localization), QSL("qtbase"), QSL("_"), APP_LANG_PATH)) { QCoreApplication::installTranslator(qt_translator); - qDebugNN << LOGSEC_CORE - << "Qt localization" - << QUOTE_W_SPACE(desired_localization) - << "loaded successfully."; + qDebugNN << LOGSEC_CORE << "Qt localization" << QUOTE_W_SPACE(desired_localization) << "loaded successfully."; } else { - qWarningNN << LOGSEC_CORE - << "Qt localization" - << QUOTE_W_SPACE(desired_localization) + qWarningNN << LOGSEC_CORE << "Qt localization" << QUOTE_W_SPACE(desired_localization) << "WAS NOT loaded successfully."; } diff --git a/src/librssguard/services/abstract/unreadnode.cpp b/src/librssguard/services/abstract/unreadnode.cpp index ae83ed036..3563cbd1a 100644 --- a/src/librssguard/services/abstract/unreadnode.cpp +++ b/src/librssguard/services/abstract/unreadnode.cpp @@ -10,6 +10,7 @@ UnreadNode::UnreadNode(RootItem* parent_item) : RootItem(parent_item) { setKind(RootItem::Kind::Unread); setId(ID_UNREAD); setIcon(qApp->icons()->fromTheme(QSL("mail-mark-unread"))); + setTitle(tr("Unread articles")); setDescription(tr("You can find all unread articles here.")); } diff --git a/src/librssguard/services/abstract/unreadnode.h b/src/librssguard/services/abstract/unreadnode.h index 5b5fcfd29..01d3b9195 100644 --- a/src/librssguard/services/abstract/unreadnode.h +++ b/src/librssguard/services/abstract/unreadnode.h @@ -6,6 +6,8 @@ #include "services/abstract/rootitem.h" class UnreadNode : public RootItem { + Q_OBJECT + public: explicit UnreadNode(RootItem* parent_item = nullptr);