From 0ad831e48ab807c3d26b4103d3de376e2962dbaa Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Wed, 28 Nov 2018 10:55:22 +0800
Subject: [PATCH 1/3] Fix strings not translated

Closes #9934.
---
 src/gui/search/searchlistdelegate.cpp | 6 +-----
 src/gui/search/searchlistdelegate.h   | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gui/search/searchlistdelegate.cpp b/src/gui/search/searchlistdelegate.cpp
index 6d9175516..11b25c679 100644
--- a/src/gui/search/searchlistdelegate.cpp
+++ b/src/gui/search/searchlistdelegate.cpp
@@ -37,10 +37,6 @@
 #include "base/utils/misc.h"
 #include "searchsortmodel.h"
 
-namespace
-{
-    const char i18nContext[] = "SearchListDelegate";
-}
 
 SearchListDelegate::SearchListDelegate(QObject *parent)
     : QItemDelegate(parent)
@@ -63,7 +59,7 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
     case SearchSortModel::LEECHES:
         opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
         QItemDelegate::drawDisplay(painter, opt, option.rect
-            , (index.data().toLongLong() >= 0) ? index.data().toString() : QCoreApplication::translate(i18nContext, "Unknown"));
+            , (index.data().toLongLong() >= 0) ? index.data().toString() : tr("Unknown"));
         break;
     default:
         QItemDelegate::paint(painter, option, index);
diff --git a/src/gui/search/searchlistdelegate.h b/src/gui/search/searchlistdelegate.h
index 9a14ac1f8..7249df68b 100644
--- a/src/gui/search/searchlistdelegate.h
+++ b/src/gui/search/searchlistdelegate.h
@@ -33,6 +33,8 @@
 
 class SearchListDelegate : public QItemDelegate
 {
+    Q_OBJECT
+
 public:
     explicit SearchListDelegate(QObject *parent);
 

From 297ef52dcbbda40409f9f40c9638adc8c948ce8f Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Wed, 28 Nov 2018 11:34:39 +0800
Subject: [PATCH 2/3] Fix weekday names translations

Closes #9933.
---
 src/gui/optionsdialog.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp
index ad186c9f4..94a93cee7 100644
--- a/src/gui/optionsdialog.cpp
+++ b/src/gui/optionsdialog.cpp
@@ -71,6 +71,21 @@
 #include "ui_optionsdialog.h"
 #include "utils.h"
 
+namespace
+{
+    QStringList translatedWeekdayNames()
+    {
+        // return translated strings from Monday to Sunday in user selected locale
+
+        const QLocale locale {Preferences::instance()->getLocale()};
+        const QDate date {2018, 11, 5};  // Monday
+        QStringList ret;
+        for (int i = 0; i < 7; ++i)
+            ret.append(locale.toString(date.addDays(i), "dddd"));
+        return ret;
+    }
+}
+
 class WheelEventEater : public QObject
 {
 public:
@@ -164,8 +179,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
     initializeLanguageCombo();
 
     // Load week days (scheduler)
-    for (uint i = 1; i <= 7; ++i)
-        m_ui->comboBoxScheduleDays->addItem(QDate::longDayName(i, QDate::StandaloneFormat));
+    m_ui->comboBoxScheduleDays->addItems(translatedWeekdayNames());
 
     // Load options
     loadOptions();

From 36429887dccc7ce3e570592a116a43b3a6ef0f4d Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sat, 1 Dec 2018 20:31:03 +0800
Subject: [PATCH 3/3] Fix wrong locale used in log message

---
 src/base/net/geoipmanager.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp
index ace840e98..fdedc0131 100644
--- a/src/base/net/geoipmanager.cpp
+++ b/src/base/net/geoipmanager.cpp
@@ -34,6 +34,7 @@
 #include <QDir>
 #include <QFile>
 #include <QHostAddress>
+#include <QLocale>
 
 #include "base/logger.h"
 #include "base/preferences.h"
@@ -100,12 +101,15 @@ void GeoIPManager::loadDatabase()
 
     QString error;
     m_geoIPDatabase = GeoIPDatabase::load(filepath, error);
-    if (m_geoIPDatabase)
+    if (m_geoIPDatabase) {
+        const QLocale locale {Preferences::instance()->getLocale()};
         Logger::instance()->addMessage(tr("GeoIP database loaded. Type: %1. Build time: %2.")
-            .arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()),
+            .arg(m_geoIPDatabase->type(), locale.toString(m_geoIPDatabase->buildEpoch())),
             Log::INFO);
-    else
+    }
+    else {
         Logger::instance()->addMessage(tr("Couldn't load GeoIP database. Reason: %1").arg(error), Log::WARNING);
+    }
 
     manageDatabaseUpdate();
 }