fixed loading system locale from wrong place
This commit is contained in:
10
main.cpp
10
main.cpp
@@ -12,6 +12,8 @@
|
||||
# include <filesystem>
|
||||
using namespace std::filesystem;
|
||||
#endif
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QTranslator>
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
@@ -46,13 +48,17 @@ int main(int argc, char *argv[]) {
|
||||
QString lang = "en_US";
|
||||
|
||||
if (s.get_all_settings().contains("language")) {
|
||||
std::cout << "settings" << std::endl;
|
||||
lang = QString::fromStdString(s.get_all_settings()["language"]);
|
||||
} else if (translator.load(QLocale::system().name())) {
|
||||
} else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) {
|
||||
std::cout << "system" << std::endl;
|
||||
lang = QLocale::system().name();
|
||||
} else {
|
||||
std::cout << "default" << std::endl;
|
||||
lang = QString::fromStdString("en_US");
|
||||
}
|
||||
translator.load(lang);
|
||||
std::cout << lang.toStdString() << std::endl;
|
||||
translator.load(":/translation/" + lang + ".qm");
|
||||
|
||||
a.installTranslator(&translator);
|
||||
MainWindow w;
|
||||
|
||||
Reference in New Issue
Block a user