From 63cf216550e627d0c93aeafadd536b9b1b6e0704 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Mon, 17 Dec 2018 00:06:23 +0200 Subject: [PATCH] Use configured locale only for translating Don't use other aspects of it eg for date formatting. We should depend on the system locale for all these. The user probably likes it that way, otherwise he would have changed it. --- src/base/net/geoipmanager.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/base/net/geoipmanager.cpp b/src/base/net/geoipmanager.cpp index 49d5c8db3..ace840e98 100644 --- a/src/base/net/geoipmanager.cpp +++ b/src/base/net/geoipmanager.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include "base/logger.h" #include "base/preferences.h" @@ -101,15 +100,12 @@ void GeoIPManager::loadDatabase() QString error; m_geoIPDatabase = GeoIPDatabase::load(filepath, error); - if (m_geoIPDatabase) { - const QLocale locale {Preferences::instance()->getLocale()}; + if (m_geoIPDatabase) Logger::instance()->addMessage(tr("GeoIP database loaded. Type: %1. Build time: %2.") - .arg(m_geoIPDatabase->type(), locale.toString(m_geoIPDatabase->buildEpoch())), + .arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()), Log::INFO); - } - else { + else Logger::instance()->addMessage(tr("Couldn't load GeoIP database. Reason: %1").arg(error), Log::WARNING); - } manageDatabaseUpdate(); } @@ -435,9 +431,8 @@ void GeoIPManager::downloadFinished(const QString &url, QByteArray data) if (m_geoIPDatabase) delete m_geoIPDatabase; m_geoIPDatabase = geoIPDatabase; - const QLocale locale {Preferences::instance()->getLocale()}; Logger::instance()->addMessage(tr("GeoIP database loaded. Type: %1. Build time: %2.") - .arg(m_geoIPDatabase->type(), locale.toString(m_geoIPDatabase->buildEpoch())), + .arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()), Log::INFO); QString targetPath = Utils::Fs::expandPathAbs( specialFolderLocation(SpecialFolder::Data) + GEOIP_FOLDER);