@ -34,7 +34,6 @@
@@ -34,7 +34,6 @@
# include <QDir>
# include <QFile>
# include <QHostAddress>
# include <QLocale>
# include "base/logger.h"
# include "base/preferences.h"
@ -101,15 +100,12 @@ void GeoIPManager::loadDatabase()
@@ -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)
@@ -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 ) ;