fixed translations
This commit is contained in:
59
main.cpp
59
main.cpp
@@ -33,9 +33,32 @@ static QWidget *loadUI(QWidget *parent, std::string filename) {
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
QUiLoader loader;
|
||||
|
||||
QApplication app(argc, argv);
|
||||
|
||||
std::string settings_file_path =
|
||||
get_path_relative_to_home(".local/share/checks_parser/settings.json");
|
||||
|
||||
Settings s(settings_file_path);
|
||||
|
||||
QTranslator translator;
|
||||
QString lang = "en_US";
|
||||
|
||||
if (s.get_all_settings().contains("language")) {
|
||||
lang = QString::fromStdString(s.get_all_settings()["language"]);
|
||||
} else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) {
|
||||
lang = QLocale::system().name();
|
||||
} else {
|
||||
lang = QString::fromStdString("en_US");
|
||||
}
|
||||
|
||||
std::cout << "Using locale: " << lang.toStdString() << std::endl;
|
||||
|
||||
translator.load(":/translation/" + lang + ".qm");
|
||||
app.installTranslator(&translator);
|
||||
|
||||
QUiLoader loader;
|
||||
|
||||
QWidget *window = new QWidget();
|
||||
QStackedLayout *sceneLayout = new QStackedLayout;
|
||||
|
||||
@@ -69,7 +92,7 @@ int main(int argc, char *argv[]) {
|
||||
OCRScene *ocrscene = new OCRScene();
|
||||
OFDScene *ofdscene = new OFDScene();
|
||||
|
||||
ofdscene->startHttpServer();
|
||||
// ofdscene->startHttpServer();
|
||||
// get_local_ip_address();
|
||||
|
||||
|
||||
@@ -90,6 +113,8 @@ int main(int argc, char *argv[]) {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
window->setLayout(sceneLayout);
|
||||
window->show();
|
||||
|
||||
@@ -139,10 +164,10 @@ int main(int argc, char *argv[]) {
|
||||
std::string program_data_path = get_path_relative_to_home(".local/share/checks_parser");
|
||||
create_directories(program_data_path);
|
||||
|
||||
std::string settings_file_path =
|
||||
get_path_relative_to_home(".local/share/checks_parser/settings.json");
|
||||
// std::string settings_file_path =
|
||||
// get_path_relative_to_home(".local/share/checks_parser/settings.json");
|
||||
|
||||
Settings s(settings_file_path);
|
||||
// Settings s(settings_file_path);
|
||||
Net n;
|
||||
|
||||
Parser p;
|
||||
@@ -161,22 +186,22 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
QApplication a(argc, argv);
|
||||
|
||||
QTranslator translator;
|
||||
QString lang = "en_US";
|
||||
// QTranslator translator;
|
||||
// QString lang = "en_US";
|
||||
|
||||
if (s.get_all_settings().contains("language")) {
|
||||
lang = QString::fromStdString(s.get_all_settings()["language"]);
|
||||
} else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) {
|
||||
lang = QLocale::system().name();
|
||||
} else {
|
||||
lang = QString::fromStdString("en_US");
|
||||
}
|
||||
// if (s.get_all_settings().contains("language")) {
|
||||
// lang = QString::fromStdString(s.get_all_settings()["language"]);
|
||||
// } else if (translator.load(":/translation/"+QLocale::system().name()+".qm")) {
|
||||
// lang = QLocale::system().name();
|
||||
// } else {
|
||||
// lang = QString::fromStdString("en_US");
|
||||
// }
|
||||
|
||||
std::cout << "Using locale: " << lang.toStdString() << std::endl;
|
||||
// std::cout << "Using locale: " << lang.toStdString() << std::endl;
|
||||
|
||||
translator.load(":/translation/" + lang + ".qm");
|
||||
// translator.load(":/translation/" + lang + ".qm");
|
||||
|
||||
a.installTranslator(&translator);
|
||||
// a.installTranslator(&translator);
|
||||
MainWindow w;
|
||||
w.update();
|
||||
w.show();
|
||||
|
||||
Reference in New Issue
Block a user