Merge pull request #88 from AttorneyOnline/i18n

I18n

9 files changed, 91 insertions, 53 deletions

diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index 4ef1edd3..6213acd6 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -135,7 +135,7 @@ void AOApplication::server_disconnected()
 {
   if (courtroom_constructed)
   {
-    call_notice("Disconnected from server.");
+    call_notice(tr("Disconnected from server."));
     construct_lobby();
     destruct_courtroom();
   }
@@ -160,16 +160,15 @@ void AOApplication::ms_connect_finished(bool connected, bool will_retry)
     if (will_retry)
     {
       if (lobby_constructed)
-        w_lobby->append_error("Error connecting to master server. Will try again in "
-                            + QString::number(net_manager->ms_reconnect_delay) + " seconds.");
+        w_lobby->append_error(tr("Error connecting to master server. Will try again in %1 seconds.").arg(QString::number(net_manager->ms_reconnect_delay)));
     }
     else
     {
-      call_error("There was an error connecting to the master server.\n"
+      call_error(tr("There was an error connecting to the master server.\n"
                  "We deploy multiple master servers to mitigate any possible downtime, "
                  "but the client appears to have exhausted all possible methods of finding "
                  "and connecting to one.\n"
-                 "Please check your Internet connection and firewall, and please try again.");
+                 "Please check your Internet connection and firewall, and please try again."));
     }
   }
 }
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index 4bfe9de2..b5cb46fe 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -167,6 +167,21 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
 
     ui_gameplay_form->setWidget(9, QFormLayout::FieldRole, ui_discord_cb);
 
+    ui_language_label = new QLabel(ui_form_layout_widget);
+    ui_language_label->setText(tr("Language:"));
+    ui_language_label->setToolTip(tr("Sets the language if you don't want to use your system language."));
+    ui_gameplay_form->setWidget(10, QFormLayout::LabelRole, ui_language_label);
+
+    ui_language_combobox = new QComboBox(ui_form_layout_widget);
+    ui_language_combobox->addItem(configini->value("language", "  ").value<QString>() + " - Keep current setting");
+    ui_language_combobox->addItem("   - Default");
+    ui_language_combobox->addItem("en - English");
+    ui_language_combobox->addItem("de - Deutsch");
+    ui_language_combobox->addItem("es - Español");
+    ui_language_combobox->addItem("jp - 日本語");
+    ui_language_combobox->addItem("ru - Русский");
+    ui_gameplay_form->setWidget(10, QFormLayout::FieldRole, ui_language_combobox);
+
     // Here we start the callwords tab.
     ui_callwords_tab = new QWidget();
     ui_settings_tabs->addTab(ui_callwords_tab, tr("Callwords"));
@@ -466,6 +481,7 @@ void AOOptionsDialog::save_pressed()
     configini->setValue("show_custom_shownames", ui_showname_cb->isChecked());
     configini->setValue("master", ui_ms_textbox->text());
     configini->setValue("discord", ui_discord_cb->isChecked());
+    configini->setValue("language", ui_language_combobox->currentText().left(2));
 
     QFile* callwordsini = new QFile(ao_app->get_base_path() + "callwords.ini");
 
diff --git a/src/charselect.cpp b/src/charselect.cpp
index 9d579a7b..0cfb7753 100644
--- a/src/charselect.cpp
+++ b/src/charselect.cpp
@@ -215,7 +215,7 @@ void Courtroom::character_loading_finished()
           int total_loading_size = ao_app->char_list_size * 2 + ao_app->evidence_list_size + ao_app->music_list_size;
           int loading_value = int(((ao_app->loaded_chars + ao_app->generated_chars + ao_app->loaded_music + ao_app->loaded_evidence) / static_cast<double>(total_loading_size)) * 100);
           ao_app->w_lobby->set_loading_value(loading_value);
-          ao_app->w_lobby->set_loading_text("Generating chars:\n" + QString::number(ao_app->generated_chars) + "/" + QString::number(ao_app->char_list_size));
+          ao_app->w_lobby->set_loading_text(tr("Generating chars:\n%1/%2").arg(QString::number(ao_app->generated_chars)).arg(QString::number(ao_app->char_list_size)));
       }
     }
 
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 7907b543..54b1b2df 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -245,7 +245,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
   ui_pair_list = new QListWidget(this);
   ui_pair_offset_spinbox = new QSpinBox(this);
   ui_pair_offset_spinbox->setRange(-100,100);
-  ui_pair_offset_spinbox->setSuffix("% offset");
+  ui_pair_offset_spinbox->setSuffix(tr("% offset"));
   ui_pair_button = new AOButton(this, ao_app);
 
   ui_evidence_button = new AOButton(this, ao_app);
@@ -563,14 +563,14 @@ void Courtroom::set_widgets()
   ui_prosecution_bar->set_image("prosecutionbar" + QString::number(prosecution_bar_state) + ".png");
 
   set_size_and_pos(ui_music_label, "music_label");
-  ui_music_label->setText("Music");
+  ui_music_label->setText(tr("Music"));
   set_size_and_pos(ui_sfx_label, "sfx_label");
-  ui_sfx_label->setText("Sfx");
+  ui_sfx_label->setText(tr("Sfx"));
   set_size_and_pos(ui_blip_label, "blip_label");
-  ui_blip_label->setText("Blips");
+  ui_blip_label->setText(tr("Blips"));
 
   set_size_and_pos(ui_log_limit_label, "log_limit_label");
-  ui_log_limit_label->setText("Log limit");
+  ui_log_limit_label->setText(tr("Log limit"));
 
   set_size_and_pos(ui_hold_it, "hold_it");
   ui_hold_it->set_image("holdit.png");
@@ -580,7 +580,7 @@ void Courtroom::set_widgets()
   ui_take_that->set_image("takethat.png");
 
   set_size_and_pos(ui_ooc_toggle, "ooc_toggle");
-  ui_ooc_toggle->setText("Server");
+  ui_ooc_toggle->setText(tr("Server"));
 
   set_size_and_pos(ui_witness_testimony, "witness_testimony");
   ui_witness_testimony->set_image("witnesstestimony.png");
@@ -593,25 +593,25 @@ void Courtroom::set_widgets()
   ui_not_guilty->set_image("notguilty.png");
 
   set_size_and_pos(ui_change_character, "change_character");
-  ui_change_character->setText("Change character");
+  ui_change_character->setText(tr("Change character"));
 
   set_size_and_pos(ui_reload_theme, "reload_theme");
-  ui_reload_theme->setText("Reload theme");
+  ui_reload_theme->setText(tr("Reload theme"));
 
   set_size_and_pos(ui_call_mod, "call_mod");
-  ui_call_mod->setText("Call mod");
+  ui_call_mod->setText(tr("Call mod"));
 
   set_size_and_pos(ui_settings, "settings");
-  ui_settings->setText("Settings");
+  ui_settings->setText(tr("Settings"));
 
   set_size_and_pos(ui_announce_casing, "casing_button");
-  ui_announce_casing->setText("Casing");
+  ui_announce_casing->setText(tr("Casing"));
 
   set_size_and_pos(ui_switch_area_music, "switch_area_music");
-  ui_switch_area_music->setText("A/M");
+  ui_switch_area_music->setText(tr("A/M"));
 
   set_size_and_pos(ui_pre, "pre");
-  ui_pre->setText("Preanim");
+  ui_pre->setText(tr("Preanim"));
 
   set_size_and_pos(ui_pre_non_interrupt, "pre_no_interrupt");
   set_size_and_pos(ui_flip, "flip");
@@ -2685,7 +2685,7 @@ void Courtroom::on_ooc_return_pressed()
     //ui_text_color->addItem("Rainbow");
     ui_ooc_chat_message->clear();
     //rainbow_appended = true;
-    append_server_chatmessage("CLIENT", tr("This does nohing, but there you go."), "1");
+    append_server_chatmessage("CLIENT", tr("This does nothing, but there you go."), "1");
     return;
   }
   else if (ooc_message.startsWith("/settings"))
@@ -2821,7 +2821,7 @@ void Courtroom::on_ooc_return_pressed()
 
     if (command.size() < 2)
     {
-      append_server_chatmessage("CLIENT", tr("You need to give a filename to load (extension not needed)! Make sure that it is in the `base/cases/` folder, and that it is a correctly formatted ini.\nCases you can load: ") + caseslist.join(", "), "1");
+      append_server_chatmessage("CLIENT", tr("You need to give a filename to load (extension not needed)! Make sure that it is in the `base/cases/` folder, and that it is a correctly formatted ini.\nCases you can load: %1").arg(caseslist.join(", ")), "1");
       ui_ooc_chat_message->clear();
       return;
     }
@@ -2842,13 +2842,13 @@ void Courtroom::on_ooc_return_pressed()
     QString casestatus = casefile.value("status", "").value<QString>();
 
     if (!caseauth.isEmpty())
-      append_server_chatmessage("CLIENT", tr("Case made by ") + caseauth + ".", "1");
+      append_server_chatmessage("CLIENT", tr("Case made by %1.").arg(caseauth), "1");
     if (!casedoc.isEmpty())
       ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/doc " + casedoc + "#%"));
     if (!casestatus.isEmpty())
       ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/status " + casestatus + "#%"));
     if (!cmdoc.isEmpty())
-      append_server_chatmessage("CLIENT", tr("Navigate to ") + cmdoc + tr(" for the CM doc."), "1");
+      append_server_chatmessage("CLIENT", tr("Navigate to %1 for the CM doc.").arg(cmdoc), "1");
 
     for (int i = local_evidence_list.size() - 1; i >= 0; i--) {
         ao_app->send_server_packet(new AOPacket("DE#" + QString::number(i) + "#%"));
@@ -2867,7 +2867,7 @@ void Courtroom::on_ooc_return_pressed()
         ao_app->send_server_packet(new AOPacket("PE", f_contents));
       }
 
-    append_server_chatmessage("CLIENT", tr("Your case \"") + command[1] + tr("\" was loaded!"), "1");
+    append_server_chatmessage("CLIENT", tr("Your case \"%1\" was loaded!").arg(command[1]), "1");
     ui_ooc_chat_message->clear();
     return;
   }
diff --git a/src/debug_functions.cpp b/src/debug_functions.cpp
index 77f2f35a..a790610d 100644
--- a/src/debug_functions.cpp
+++ b/src/debug_functions.cpp
@@ -1,11 +1,14 @@
+#include <QMessageBox>
+#include <QCoreApplication>
+
 #include "debug_functions.h"
 
 void call_error(QString p_message)
 {
   QMessageBox *msgBox = new QMessageBox;
 
-  msgBox->setText("Error: " + p_message);
-  msgBox->setWindowTitle("Error");
+  msgBox->setText(QCoreApplication::translate("debug_functions", "Error: %1").arg(p_message));
+  msgBox->setWindowTitle(QCoreApplication::translate("debug_functions", "Error"));
 
 
   //msgBox->setWindowModality(Qt::NonModal);
@@ -17,7 +20,7 @@ void call_notice(QString p_message)
   QMessageBox *msgBox = new QMessageBox;
 
   msgBox->setText(p_message);
-  msgBox->setWindowTitle("Notice");
+  msgBox->setWindowTitle(QCoreApplication::translate("debug_functions", "Notice"));
 
 
   //msgBox->setWindowModality(Qt::NonModal);
diff --git a/src/evidence.cpp b/src/evidence.cpp
index ebef7490..341bed0f 100644
--- a/src/evidence.cpp
+++ b/src/evidence.cpp
@@ -22,7 +22,7 @@ void Courtroom::construct_evidence()
   ui_evidence_delete = new AOButton(ui_evidence_overlay, ao_app);
   ui_evidence_image_name = new AOLineEdit(ui_evidence_overlay);
   ui_evidence_image_button = new AOButton(ui_evidence_overlay, ao_app);
-  ui_evidence_image_button->setText("Choose..");
+  ui_evidence_image_button->setText(tr("Choose..."));
   ui_evidence_x = new AOButton(ui_evidence_overlay, ao_app);
 
   ui_evidence_description = new AOTextEdit(ui_evidence_overlay);
@@ -265,7 +265,7 @@ void Courtroom::on_evidence_hover(int p_id, bool p_state)
   if (p_state)
   {
     if (final_id == local_evidence_list.size())
-      ui_evidence_name->setText("Add new evidence...");
+      ui_evidence_name->setText(tr("Add new evidence..."));
     else if (final_id < local_evidence_list.size())
       ui_evidence_name->setText(local_evidence_list.at(final_id).name);
   }
diff --git a/src/lobby.cpp b/src/lobby.cpp
index 4a96e567..c95fd49c 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -9,7 +9,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
 {
   ao_app = p_ao_app;
 
-  this->setWindowTitle("Attorney Online 2");
+  this->setWindowTitle(tr("Attorney Online 2"));
   this->setWindowIcon(QIcon(":/logo.png"));
 
   ui_background = new AOImage(this, ao_app);
@@ -26,7 +26,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
   ui_chatbox = new AOTextArea(this);
   ui_chatbox->setOpenExternalLinks(true);
   ui_chatname = new QLineEdit(this);
-  ui_chatname->setPlaceholderText("Name");
+  ui_chatname->setPlaceholderText(tr("Name"));
   ui_chatname->setText(ao_app->get_ooc_name());
   ui_chatmessage = new QLineEdit(this);
   ui_loading_background = new AOImage(this, ao_app);
@@ -71,9 +71,9 @@ void Lobby::set_widgets()
     qDebug() << "W: did not find lobby width or height in " << filename;
 
     // Most common symptom of bad config files and missing assets.
-    call_notice("It doesn't look like your client is set up correctly.\n"
+    call_notice(tr("It doesn't look like your client is set up correctly.\n"
                 "Did you download all resources correctly from tiny.cc/getao, "
-                "including the large 'base' folder?");
+                "including the large 'base' folder?"));
 
     this->resize(517, 666);
   }
@@ -101,7 +101,7 @@ void Lobby::set_widgets()
   ui_connect->set_image("connect.png");
 
   set_size_and_pos(ui_version, "version");
-  ui_version->setText("Version: " + ao_app->get_version_string());
+  ui_version->setText(tr("Version: %1").arg(ao_app->get_version_string()));
 
   set_size_and_pos(ui_about, "about");
   ui_about->set_image("about.png");
@@ -111,7 +111,7 @@ void Lobby::set_widgets()
                                   "font: bold;");
 
   set_size_and_pos(ui_player_count, "player_count");
-  ui_player_count->setText("Offline");
+  ui_player_count->setText(tr("Offline"));
   ui_player_count->setStyleSheet("font: bold;"
                                  "color: white;"
                                  "qproperty-alignment: AlignCenter;");
@@ -144,11 +144,11 @@ void Lobby::set_widgets()
   ui_loading_text->setFrameStyle(QFrame::NoFrame);
   ui_loading_text->setStyleSheet("background-color: rgba(0, 0, 0, 0);"
                                  "color: rgba(255, 128, 0, 255);");
-  ui_loading_text->append("Loading");
+  ui_loading_text->append(tr("Loading"));
 
   set_size_and_pos(ui_progress_bar, "progress_bar");
   set_size_and_pos(ui_cancel, "cancel");
-  ui_cancel->setText("Cancel");
+  ui_cancel->setText(tr("Cancel"));
 
   ui_loading_background->hide();
 
@@ -313,7 +313,7 @@ void Lobby::on_server_list_clicked(QModelIndex p_model)
   ui_description->moveCursor(QTextCursor::Start);
   ui_description->ensureCursorVisible();
 
-  ui_player_count->setText("Offline");
+  ui_player_count->setText(tr("Offline"));
 
   ui_connect->setEnabled(false);
 
@@ -373,7 +373,7 @@ void Lobby::append_error(QString f_message)
 
 void Lobby::set_player_count(int players_online, int max_players)
 {
-  QString f_string = "Online: " + QString::number(players_online) + "/" + QString::number(max_players);
+  QString f_string = tr("Online: %1/%2").arg(QString::number(players_online)).arg(QString::number(max_players));
   ui_player_count->setText(f_string);
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 80ea93bb..6c7b1513 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,3 @@
-
 #include "aoapplication.h"
 
 #include "datatypes.h"
@@ -7,6 +6,9 @@
 #include "courtroom.h"
 #include <QPluginLoader>
 #include <QDebug>
+#include <QTranslator>
+#include <QLibraryInfo>
+
 int main(int argc, char *argv[])
 {
 #if QT_VERSION > QT_VERSION_CHECK(5, 6, 0)
@@ -17,6 +19,23 @@ int main(int argc, char *argv[])
 #endif
 
     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_" + p_language,
+            QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    main_app.installTranslator(&qtTranslator);
+
+    QTranslator appTranslator;
+    qDebug() << ":/resource/translations/ao_" + p_language;
+    appTranslator.load("ao_" + p_language, ":/resource/translations/");
+    main_app.installTranslator(&appTranslator);
+
     main_app.construct_lobby();
     main_app.net_manager->connect_to_master();
     main_app.w_lobby->show();
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 942c275d..b79ec309 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -103,15 +103,16 @@ void AOApplication::ms_packet_received(AOPacket *p_packet)
       }
     }
 
-    call_notice("Outdated version! Your version: " + get_version_string()
-                + "\nPlease go to aceattorneyonline.com to update.");
+    call_notice(tr("Outdated version! Your version: %1\n"
+                   "Please go to aceattorneyonline.com to update.")
+                .arg(get_version_string()));
     destruct_courtroom();
     destruct_lobby();
   }
   else if (header == "DOOM")
   {
-    call_notice("You have been exiled from AO."
-                "Have a nice day.");
+    call_notice(tr("You have been exiled from AO.\n"
+                   "Have a nice day."));
     destruct_courtroom();
     destruct_lobby();
   }
@@ -245,7 +246,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     courtroom_loaded = false;
 
-    QString window_title = "Attorney Online 2";
+    QString window_title = tr("Attorney Online 2");
     int selected_server = w_lobby->get_selected_server();
 
     QString server_address = "", server_name = "";
@@ -271,7 +272,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     w_courtroom->set_window_title(window_title);
 
     w_lobby->show_loading_overlay();
-    w_lobby->set_loading_text("Loading");
+    w_lobby->set_loading_text(tr("Loading"));
     w_lobby->set_loading_value(0);
 
     AOPacket *f_packet;
@@ -359,7 +360,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
     ++loaded_evidence;
 
-    w_lobby->set_loading_text("Loading evidence:\n" + QString::number(loaded_evidence) + "/" + QString::number(evidence_list_size));
+    w_lobby->set_loading_text(tr("Loading evidence:\n%1/%2").arg(QString::number(loaded_evidence)).arg(QString::number(evidence_list_size)));
 
     w_courtroom->append_evidence(f_evi);
 
@@ -391,7 +392,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
       ++loaded_music;
 
-      w_lobby->set_loading_text("Loading music:\n" + QString::number(loaded_music) + "/" + QString::number(music_list_size));
+      w_lobby->set_loading_text(tr("Loading music:\n%1/%2").arg(QString::number(loaded_music)).arg(QString::number(music_list_size)));
 
       if (musics_time)
       {
@@ -463,7 +464,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
 
       ++loaded_chars;
 
-      w_lobby->set_loading_text("Loading chars:\n" + QString::number(loaded_chars) + "/" + QString::number(char_list_size));
+      w_lobby->set_loading_text(tr("Loading chars:\n%1/%2").arg(QString::number(loaded_chars)).arg(QString::number(char_list_size)));
 
       w_courtroom->append_char(f_char);
 
@@ -486,7 +487,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     {
       ++loaded_music;
 
-      w_lobby->set_loading_text("Loading music:\n" + QString::number(loaded_music) + "/" + QString::number(music_list_size));
+      w_lobby->set_loading_text(tr("Loading music:\n%1/%2").arg(QString::number(loaded_music)).arg(QString::number(music_list_size)));
 
       if (musics_time)
       {
@@ -638,7 +639,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
   {
     if (courtroom_constructed && f_contents.size() >= 1)
     {
-      call_notice("You have been kicked from the server.\nReason: " + f_contents.at(0));
+      call_notice(tr("You have been kicked from the server.\nReason: %1").arg(f_contents.at(0)));
       construct_lobby();
       destruct_courtroom();
     }
@@ -647,7 +648,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
   {
     if (courtroom_constructed && f_contents.size() >= 1)
     {
-      call_notice("You have been banned from the server.\nReason: " + f_contents.at(0));
+      call_notice(tr("You have been banned from the server.\nReason: %1").arg(f_contents.at(0)));
       construct_lobby();
       destruct_courtroom();
     }
@@ -655,7 +656,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
   }
   else if (header == "BD")
   {
-    call_notice("You are banned on this server.\nReason: " + f_contents.at(0));
+    call_notice(tr("You are banned on this server.\nReason: %1").arg(f_contents.at(0)));
   }
   else if (header == "ZZ")
   {