fix UNREAD ARTICLES translation not showing
This commit is contained in:
parent
3dc744a9a0
commit
a8e844e88d
|
@ -9,8 +9,7 @@
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
#include <QTranslator>
|
#include <QTranslator>
|
||||||
|
|
||||||
Localization::Localization(QObject* parent)
|
Localization::Localization(QObject* parent) : QObject(parent) {}
|
||||||
: QObject(parent) {}
|
|
||||||
|
|
||||||
Localization::~Localization() = default;
|
Localization::~Localization() = default;
|
||||||
|
|
||||||
|
@ -23,8 +22,7 @@ void Localization::loadActiveLanguage() {
|
||||||
auto* app_translator = new QTranslator(qApp);
|
auto* app_translator = new QTranslator(qApp);
|
||||||
QString desired_localization = desiredLanguage();
|
QString desired_localization = desiredLanguage();
|
||||||
|
|
||||||
qDebugNN << LOGSEC_CORE
|
qDebugNN << LOGSEC_CORE << "Starting to load active localization. Desired localization is"
|
||||||
<< "Starting to load active localization. Desired localization is"
|
|
||||||
<< QUOTE_W_SPACE_DOT(desired_localization);
|
<< QUOTE_W_SPACE_DOT(desired_localization);
|
||||||
|
|
||||||
if (app_translator->load(QLocale(desired_localization), QSL("rssguard"), QSL("_"), APP_LANG_PATH)) {
|
if (app_translator->load(QLocale(desired_localization), QSL("rssguard"), QSL("_"), APP_LANG_PATH)) {
|
||||||
|
@ -32,21 +30,14 @@ void Localization::loadActiveLanguage() {
|
||||||
|
|
||||||
QCoreApplication::installTranslator(app_translator);
|
QCoreApplication::installTranslator(app_translator);
|
||||||
|
|
||||||
qDebugNN << LOGSEC_CORE
|
qDebugNN << LOGSEC_CORE << "Application localization" << QUOTE_W_SPACE(desired_localization)
|
||||||
<< "Application localization"
|
<< "loaded successfully, specifically sublocalization" << QUOTE_W_SPACE(real_loaded_locale)
|
||||||
<< QUOTE_W_SPACE(desired_localization)
|
|
||||||
<< "loaded successfully, specifically sublocalization"
|
|
||||||
<< QUOTE_W_SPACE(real_loaded_locale)
|
|
||||||
<< "was loaded.";
|
<< "was loaded.";
|
||||||
desired_localization = real_loaded_locale;
|
desired_localization = real_loaded_locale;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qWarningNN << LOGSEC_CORE
|
qWarningNN << LOGSEC_CORE << "Application localization" << QUOTE_W_SPACE(desired_localization)
|
||||||
<< "Application localization"
|
<< "was not loaded. Loading" << QUOTE_W_SPACE(DEFAULT_LOCALE) << "instead.";
|
||||||
<< QUOTE_W_SPACE(desired_localization)
|
|
||||||
<< "was not loaded. Loading"
|
|
||||||
<< QUOTE_W_SPACE(DEFAULT_LOCALE)
|
|
||||||
<< "instead.";
|
|
||||||
desired_localization = QSL(DEFAULT_LOCALE);
|
desired_localization = QSL(DEFAULT_LOCALE);
|
||||||
|
|
||||||
if (!app_translator->load(QLocale(desired_localization), QSL("rssguard"), QSL("_"), APP_LANG_PATH)) {
|
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)) {
|
if (qt_translator->load(QLocale(desired_localization), QSL("qtbase"), QSL("_"), APP_LANG_PATH)) {
|
||||||
QCoreApplication::installTranslator(qt_translator);
|
QCoreApplication::installTranslator(qt_translator);
|
||||||
|
|
||||||
qDebugNN << LOGSEC_CORE
|
qDebugNN << LOGSEC_CORE << "Qt localization" << QUOTE_W_SPACE(desired_localization) << "loaded successfully.";
|
||||||
<< "Qt localization"
|
|
||||||
<< QUOTE_W_SPACE(desired_localization)
|
|
||||||
<< "loaded successfully.";
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
qWarningNN << LOGSEC_CORE
|
qWarningNN << LOGSEC_CORE << "Qt localization" << QUOTE_W_SPACE(desired_localization)
|
||||||
<< "Qt localization"
|
|
||||||
<< QUOTE_W_SPACE(desired_localization)
|
|
||||||
<< "WAS NOT loaded successfully.";
|
<< "WAS NOT loaded successfully.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,7 @@ UnreadNode::UnreadNode(RootItem* parent_item) : RootItem(parent_item) {
|
||||||
setKind(RootItem::Kind::Unread);
|
setKind(RootItem::Kind::Unread);
|
||||||
setId(ID_UNREAD);
|
setId(ID_UNREAD);
|
||||||
setIcon(qApp->icons()->fromTheme(QSL("mail-mark-unread")));
|
setIcon(qApp->icons()->fromTheme(QSL("mail-mark-unread")));
|
||||||
|
|
||||||
setTitle(tr("Unread articles"));
|
setTitle(tr("Unread articles"));
|
||||||
setDescription(tr("You can find all unread articles here."));
|
setDescription(tr("You can find all unread articles here."));
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
#include "services/abstract/rootitem.h"
|
#include "services/abstract/rootitem.h"
|
||||||
|
|
||||||
class UnreadNode : public RootItem {
|
class UnreadNode : public RootItem {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit UnreadNode(RootItem* parent_item = nullptr);
|
explicit UnreadNode(RootItem* parent_item = nullptr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue