From 762702aff852701c44eb0f07ee02c0fdfd1fd85b Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Tue, 29 May 2018 19:21:49 -0500 Subject: Make all strings translatable --- src/main.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 80ea93bb..8b7cb50f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -7,6 +7,20 @@ #include "courtroom.h" #include #include +#include + +static void install_translators(QtApplication &app) +{ + QTranslator qtTranslator; + qtTranslator.load("qt_" + QLocale::system().name(), + QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + app.installTranslator(&qtTranslator); + + QTranslator appTranslator; + appTranslator.load("ao_" + QLocale::system().name()); + app.installTranslator(&appTranslator); +} + int main(int argc, char *argv[]) { #if QT_VERSION > QT_VERSION_CHECK(5, 6, 0) @@ -17,6 +31,9 @@ int main(int argc, char *argv[]) #endif AOApplication main_app(argc, argv); + + install_translators(&main_app); + main_app.construct_lobby(); main_app.net_manager->connect_to_master(); main_app.w_lobby->show(); -- cgit From 69e4da4c43982205d8b94e182a25746ca72340d4 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 28 Jul 2019 19:17:47 +0200 Subject: it didn't like doing that with a pointer --- src/main.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 8b7cb50f..26b97bf0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,18 +8,7 @@ #include #include #include - -static void install_translators(QtApplication &app) -{ - QTranslator qtTranslator; - qtTranslator.load("qt_" + QLocale::system().name(), - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - app.installTranslator(&qtTranslator); - - QTranslator appTranslator; - appTranslator.load("ao_" + QLocale::system().name()); - app.installTranslator(&appTranslator); -} +#include int main(int argc, char *argv[]) { @@ -32,7 +21,14 @@ int main(int argc, char *argv[]) AOApplication main_app(argc, argv); - install_translators(&main_app); + QTranslator qtTranslator; + qtTranslator.load("qt_" + QLocale::system().name(), + QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + main_app.installTranslator(&qtTranslator); + + QTranslator appTranslator; + appTranslator.load("ao_" + QLocale::system().name()); + main_app.installTranslator(&appTranslator); main_app.construct_lobby(); main_app.net_manager->connect_to_master(); -- cgit From 259422c4af2548c7c0e91df4deb22171c07aa9f6 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 28 Jul 2019 20:39:36 +0200 Subject: at least the german translation works --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 26b97bf0..7bf766fa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) main_app.installTranslator(&qtTranslator); QTranslator appTranslator; - appTranslator.load("ao_" + QLocale::system().name()); + appTranslator.load("ao_" + QLocale::system().name(),"base/translations/"); main_app.installTranslator(&appTranslator); main_app.construct_lobby(); -- cgit From adf1a973044a2b7ab7b51195bcd2e5b19ec6eeb5 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 29 Jul 2019 21:54:35 +0200 Subject: adjust translation path in main.cpp --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 7bf766fa..7c2daa66 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,7 +27,7 @@ int main(int argc, char *argv[]) main_app.installTranslator(&qtTranslator); QTranslator appTranslator; - appTranslator.load("ao_" + QLocale::system().name(),"base/translations/"); + appTranslator.load("ao_" + QLocale::system().name(),":/resource/translations/"); main_app.installTranslator(&appTranslator); main_app.construct_lobby(); -- cgit From 078ad79b65692644a1d7230b4cfb9277a16d0310 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 5 Aug 2019 23:30:00 +0200 Subject: language setting --- src/main.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 7c2daa66..6c15e6f7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,13 +21,20 @@ int main(int argc, char *argv[]) AOApplication main_app(argc, argv); + QSettings* configini = main_app.configini; + + QString p_language = configini->value("language",QLocale::system().name()).toString(); + if (p_language==" " || p_language=="") + p_language = QLocale::system().name(); + QTranslator qtTranslator; - qtTranslator.load("qt_" + QLocale::system().name(), + qtTranslator.load("qt_" + p_language, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); main_app.installTranslator(&qtTranslator); QTranslator appTranslator; - appTranslator.load("ao_" + QLocale::system().name(),":/resource/translations/"); + qDebug() << ":/resource/translations/ao_" + p_language; + appTranslator.load("ao_" + p_language,":/resource/translations/"); main_app.installTranslator(&appTranslator); main_app.construct_lobby(); -- cgit From c6b949335ac5f4a2ab060e692e8022060a802960 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 6 Aug 2019 21:27:27 +0200 Subject: +1 on style --- src/main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 6c15e6f7..6c7b1513 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,3 @@ - #include "aoapplication.h" #include "datatypes.h" @@ -21,10 +20,10 @@ int main(int argc, char *argv[]) AOApplication main_app(argc, argv); - QSettings* configini = main_app.configini; + QSettings *configini = main_app.configini; - QString p_language = configini->value("language",QLocale::system().name()).toString(); - if (p_language==" " || p_language=="") + QString p_language = configini->value("language", QLocale::system().name()).toString(); + if (p_language == " " || p_language == "") p_language = QLocale::system().name(); QTranslator qtTranslator; @@ -34,7 +33,7 @@ int main(int argc, char *argv[]) QTranslator appTranslator; qDebug() << ":/resource/translations/ao_" + p_language; - appTranslator.load("ao_" + p_language,":/resource/translations/"); + appTranslator.load("ao_" + p_language, ":/resource/translations/"); main_app.installTranslator(&appTranslator); main_app.construct_lobby(); -- cgit