diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp index 4cfa2c6d7..ff946d539 100644 --- a/src/app/puzzle/vpapplication.cpp +++ b/src/app/puzzle/vpapplication.cpp @@ -397,6 +397,8 @@ void VPApplication::InitOptions() qCDebug(pApp, "Command-line arguments: %s", qUtf8Printable(arguments().join(", "))); qCDebug(pApp, "Process ID: %s", qUtf8Printable(QString().setNum(applicationPid()))); + CheckSystemLocale(); + QPixmapCache::setCacheLimit(50 * 1024 /* 50 MB */); LoadTranslation(QString());// By default the console version uses system locale diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 81457c799..13c757c41 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -423,6 +423,8 @@ void MApplication::InitOptions() qCDebug(mApp, "Command-line arguments: %s", qUtf8Printable(arguments().join(", "))); qCDebug(mApp, "Process ID: %s", qUtf8Printable(QString().setNum(applicationPid()))); + CheckSystemLocale(); + LoadTranslation(QString());// By default the console version uses system locale static const char * GENERIC_ICON_TO_CHECK = "document-open"; diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index 050426c12..696baff17 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -33,9 +33,7 @@ #include "../ifc/exception/vexceptionemptyparameter.h" #include "../ifc/exception/vexceptionwrongid.h" #include "../ifc/exception/vexceptioninvalidnotch.h" -#include "../vwidgets/vmaingraphicsview.h" #include "../version.h" -#include "../vmisc/vmath.h" #include "../qmuparser/qmuparsererror.h" #include "../mainwindow.h" #include "../vmisc/qt_dispatch/qt_dispatch.h" @@ -617,6 +615,8 @@ void VApplication::InitOptions() qDebug()<<"Command-line arguments:"<GetPMSystemCode(); - pmsTranslator = new QTranslator(this); LoadQM(pmsTranslator, QStringLiteral("measurements_") + Settings()->GetPMSystemCode() + '_', locale, appQmDir); installTranslator(pmsTranslator); @@ -355,3 +353,13 @@ QFileDialog::Options VAbstractApplication::NativeFileDialog(QFileDialog::Options return options; } + +//--------------------------------------------------------------------------------------------------------------------- +void VAbstractApplication::CheckSystemLocale() +{ + const QString defLocale = QLocale::system().name(); + if (defLocale.startsWith(QLatin1String("ru"))) + { + qFatal("Incompatible locale \"%s\"", qPrintable(defLocale)); + } +} diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h index 8e77da9f1..bc134f795 100644 --- a/src/libs/vmisc/vabstractapplication.h +++ b/src/libs/vmisc/vabstractapplication.h @@ -106,6 +106,8 @@ protected: virtual void InitTrVars()=0; + static void CheckSystemLocale(); + protected slots: virtual void AboutToQuit()=0;