FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix UNREAD ARTICLES translation not showing

This commit is contained in:
Martin Rotter 2023-08-11 10:17:32 +02:00
parent 3dc744a9a0
commit a8e844e88d
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/librssguard/miscellaneous/localization.cpp
View File

@ -9,8 +9,7 @@
#include <QLocale>
#include <QTranslator>
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.";
}

1
src/librssguard/services/abstract/unreadnode.cpp
View File

@ -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."));
}

2
src/librssguard/services/abstract/unreadnode.h
View File

@ -6,6 +6,8 @@
#include "services/abstract/rootitem.h"
class UnreadNode : public RootItem {
Q_OBJECT
public:
explicit UnreadNode(RootItem* parent_item = nullptr);