From ba9aebec57d231236642f9e58329b1d87b264dbd Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 23 May 2020 18:32:05 +0200 Subject: [PATCH] translate stuff that got run over --- include/chatlogpiece.h | 2 ++ src/aooptionsdialog.cpp | 4 +-- src/chatlogpiece.cpp | 8 +++--- src/courtroom.cpp | 54 ++++++++++++++++++------------------- src/evidence.cpp | 35 ++++++++++++------------ src/lobby.cpp | 12 ++++----- src/packet_distribution.cpp | 10 +++---- 7 files changed, 62 insertions(+), 63 deletions(-) diff --git a/include/chatlogpiece.h b/include/chatlogpiece.h index e6f77c7..f3a9dc8 100644 --- a/include/chatlogpiece.h +++ b/include/chatlogpiece.h @@ -1,10 +1,12 @@ #ifndef CHATLOGPIECE_H #define CHATLOGPIECE_H +#include #include #include class chatlogpiece { + Q_DECLARE_TR_FUNCTIONS(chatlogpiece) public: chatlogpiece(); chatlogpiece(QString p_name, QString p_showname, QString p_message, diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index e911963..80746f7 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -205,7 +205,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) ui_language_combobox = new QComboBox(ui_form_layout_widget); ui_language_combobox->addItem( configini->value("language", " ").value() + - " - Keep current setting"); + tr(" - Keep current setting")); ui_language_combobox->addItem(" - Default"); ui_language_combobox->addItem("en - English"); ui_language_combobox->addItem("de - Deutsch"); @@ -384,7 +384,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) int a = 0; if (needs_default_audiodev()) { - ui_audio_device_combobox->addItem("default"); + ui_audio_device_combobox->addItem("default"); //TODO translate this without breaking the default audio device } #ifdef BASSAUDIO BASS_DEVICEINFO info; diff --git a/src/chatlogpiece.cpp b/src/chatlogpiece.cpp index 34a2fea..ec964b9 100644 --- a/src/chatlogpiece.cpp +++ b/src/chatlogpiece.cpp @@ -2,9 +2,9 @@ chatlogpiece::chatlogpiece() { - name = "UNKNOWN"; - showname = "UNKNOWN"; - message = "UNKNOWN"; + name = tr("UNKNOWN"); + showname = tr("UNKNOWN"); + message = tr("UNKNOWN"); p_is_song = false; datetime = QDateTime::currentDateTime().toUTC(); } @@ -52,7 +52,7 @@ QString chatlogpiece::get_full() full.append(get_name()); full.append(")"); if (p_is_song) - full.append(" has played a song: "); + full.append(tr(" has played a song: ")); else full.append(": "); full.append(get_message()); diff --git a/src/courtroom.cpp b/src/courtroom.cpp index caab3a5..e3eeb59 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -164,7 +164,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_ooc_chat_name = new QLineEdit(this); ui_ooc_chat_name->setFrame(false); - ui_ooc_chat_name->setPlaceholderText("Name"); + ui_ooc_chat_name->setPlaceholderText(tr("Name")); ui_ooc_chat_name->setMaxLength(30); ui_ooc_chat_name->setText(p_ao_app->get_default_username()); @@ -214,14 +214,14 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_switch_area_music = new AOButton(this, ao_app); ui_pre = new QCheckBox(this); - ui_pre->setText("Pre"); + ui_pre->setText(tr("Pre")); ui_flip = new QCheckBox(this); - ui_flip->setText("Flip"); + ui_flip->setText(tr("Flip")); ui_flip->hide(); ui_guard = new QCheckBox(this); - ui_guard->setText("Guard"); + ui_guard->setText(tr("Guard")); ui_guard->hide(); ui_additive = new QCheckBox(this); @@ -274,8 +274,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() ui_pair_offset_spinbox->setSuffix(tr("% offset")); ui_pair_order_dropdown = new QComboBox(this); - ui_pair_order_dropdown->addItem("To front"); - ui_pair_order_dropdown->addItem("To behind"); + ui_pair_order_dropdown->addItem(tr("To front")); + ui_pair_order_dropdown->addItem(tr("To behind")); ui_pair_button = new AOButton(this, ao_app); @@ -739,11 +739,11 @@ void Courtroom::set_widgets() QString::number(prosecution_bar_state)); 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_hold_it, "hold_it"); ui_hold_it->setText(tr("Hold It!")); @@ -1454,7 +1454,7 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message, if (p_message == "Logged in as a moderator.") { ui_guard->show(); append_server_chatmessage( - "CLIENT", "You were granted the Disable Modcalls button.", "1"); + tr("CLIENT"), tr("You were granted the Disable Modcalls button."), "1"); } ui_server_chatlog->append_chatmessage(p_name, p_message, color); @@ -2981,7 +2981,7 @@ void Courtroom::set_ban(int p_cid) if (p_cid != m_cid && p_cid != -1) return; - call_notice("You have been banned."); + call_notice(tr("You have been banned.")); ao_app->construct_lobby(); ao_app->destruct_courtroom(); @@ -3058,7 +3058,7 @@ void Courtroom::handle_song(QStringList *p_contents) ic_chatlog_history.removeFirst(); } - append_ic_text(f_song_clear, str_show, "has played a song"); + append_ic_text(f_song_clear, str_show, tr("has played a song")); music_player->play(f_song, channel, looping, effect_flags); if (channel == 0) @@ -3192,9 +3192,7 @@ void Courtroom::on_ooc_return_pressed() if (ok) { if (whom > -1) { other_charid = whom; - QString msg = "You will now pair up with "; - msg.append(char_list.at(whom).name); - msg.append(" if they also choose your character in return."); + QString msg = tr("You will now pair up with %1 if they also choose your character in return.").arg(char_list.at(whom).name); append_server_chatmessage("CLIENT", msg, "1"); } else { @@ -3342,7 +3340,7 @@ void Courtroom::on_ooc_return_pressed() QString casestatus = casefile.value("status", "").value(); if (!caseauth.isEmpty()) - append_server_chatmessage("CLIENT", tr("Case made by %1.").arg(caseauth), + append_server_chatmessage(tr("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() + @@ -3366,9 +3364,9 @@ void Courtroom::on_ooc_return_pressed() QStringList f_contents; f_contents.append( - casefile.value(evi + "/name", "UNKNOWN").value()); + casefile.value(evi + "/name", tr("UNKNOWN")).value()); f_contents.append( - casefile.value(evi + "/description", "UNKNOWN").value()); + casefile.value(evi + "/description", tr("UNKNOWN")).value()); f_contents.append( casefile.value(evi + "/image", "UNKNOWN.png").value()); @@ -3967,25 +3965,25 @@ void Courtroom::on_music_list_context_menu_requested(const QPoint &pos) { QMenu *menu = new QMenu(); - menu->addAction(QString("Expand All Categories"), this, + menu->addAction(QString(tr("Expand All Categories")), this, SLOT(music_list_expand_all())); - menu->addAction(QString("Collapse All Categories"), this, + menu->addAction(QString(tr("Collapse All Categories")), this, SLOT(music_list_collapse_all())); menu->addSeparator(); - menu->addAction(new QAction("Fade Out Previous", this)); + menu->addAction(new QAction(tr("Fade Out Previous"), this)); menu->actions().back()->setCheckable(true); menu->actions().back()->setChecked(music_flags & FADE_OUT); connect(menu->actions().back(), SIGNAL(toggled(bool)), this, SLOT(music_fade_out(bool))); - menu->addAction(new QAction("Fade In", this)); + menu->addAction(new QAction(tr("Fade In"), this)); menu->actions().back()->setCheckable(true); menu->actions().back()->setChecked(music_flags & FADE_IN); connect(menu->actions().back(), SIGNAL(toggled(bool)), this, SLOT(music_fade_in(bool))); - menu->addAction(new QAction("Synchronize", this)); + menu->addAction(new QAction(tr("Synchronize"), this)); menu->actions().back()->setCheckable(true); menu->actions().back()->setChecked(music_flags & SYNC_POS); connect(menu->actions().back(), SIGNAL(toggled(bool)), this, @@ -4416,8 +4414,8 @@ void Courtroom::on_call_mod_clicked() QInputDialog input; input.setWindowFlags(Qt::WindowSystemMenuHint); - input.setLabelText("Reason:"); - input.setWindowTitle("Call Moderator"); + input.setLabelText(tr("Reason:")); + input.setWindowTitle(tr("Call Moderator")); auto code = input.exec(); if (code != QDialog::Accepted) @@ -4425,7 +4423,7 @@ void Courtroom::on_call_mod_clicked() QString text = input.textValue(); if (text.isEmpty()) { - errorBox.critical(nullptr, "Error", "You must provide a reason."); + errorBox.critical(nullptr, tr("Error"), tr("You must provide a reason.")); return; } else if (text.length() > 256) { @@ -4478,14 +4476,14 @@ void Courtroom::on_showname_enable_clicked() if (ui_showname_enable->isChecked()) { if (item.is_song()) append_ic_text(item.get_message(), item.get_showname(), - "has played a song"); + tr("has played a song")); else append_ic_text(item.get_message(), item.get_showname()); } else { if (item.is_song()) append_ic_text(item.get_message(), item.get_name(), - "has played a song"); + tr("has played a song")); else append_ic_text(item.get_message(), item.get_name()); } diff --git a/src/evidence.cpp b/src/evidence.cpp index dffe848..99d365d 100644 --- a/src/evidence.cpp +++ b/src/evidence.cpp @@ -31,7 +31,7 @@ void Courtroom::initialize_evidence() ui_evidence_delete->setToolTip(tr("Destroy this piece of evidence")); 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_x->setToolTip( tr("Close the evidence display/editing overlay.\n" @@ -45,7 +45,7 @@ void Courtroom::initialize_evidence() "color: white;"); ui_evidence_description->setFrameStyle(QFrame::NoFrame); ui_evidence_description->setToolTip( - "Double-click to edit. Press [X] to update your changes."); + tr("Double-click to edit. Press [X] to update your changes.")); connect(ui_evidence_name, SIGNAL(returnPressed()), this, SLOT(on_evidence_name_edited())); @@ -260,13 +260,12 @@ void Courtroom::set_evidence_list(QVector &p_evi_list) local_evidence_list.at(current_evidence))) { QMessageBox *msgBox = new QMessageBox; - msgBox->setText("The piece of evidence you've been editing has changed."); - msgBox->setInformativeText("Do you wish to keep your changes?"); - msgBox->setDetailedText( - "Name: " + local_evidence_list.at(current_evidence).name + - "\nImage: " + local_evidence_list.at(current_evidence).image + - "\nDescription:\n" + - local_evidence_list.at(current_evidence).description); + msgBox->setText(tr("The piece of evidence you've been editing has changed.")); + msgBox->setInformativeText(tr("Do you wish to keep your changes?")); + msgBox->setDetailedText(tr( + "Name: %1\n" + "Image: %2\n" + "Description:\n%3").arg(local_evidence_list.at(current_evidence).name).arg(local_evidence_list.at(current_evidence).image).arg(local_evidence_list.at(current_evidence).description)); msgBox->setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox->setDefaultButton(QMessageBox::LastButton); // msgBox->setWindowModality(Qt::NonModal); @@ -454,14 +453,14 @@ void Courtroom::on_evidence_double_clicked(int p_id) ui_evidence_description->clear(); ui_evidence_description->appendPlainText(f_evi.description); ui_evidence_description->setReadOnly(true); - ui_evidence_description->setToolTip("Double-click to edit..."); + ui_evidence_description->setToolTip(tr("Double-click to edit...")); ui_evidence_name->setText(f_evi.name); ui_evidence_name->setReadOnly(true); - ui_evidence_name->setToolTip("Double-click to edit..."); + ui_evidence_name->setToolTip(tr("Double-click to edit...")); ui_evidence_image_name->setText(f_evi.image); ui_evidence_image_name->setReadOnly(true); - ui_evidence_image_name->setToolTip("Double-click to edit..."); + ui_evidence_image_name->setToolTip(tr("Double-click to edit...")); ui_evidence_overlay->show(); ui_evidence_ok->hide(); @@ -476,7 +475,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); } @@ -554,8 +553,8 @@ void Courtroom::on_evidence_x_clicked() return; } QMessageBox *msgBox = new QMessageBox; - msgBox->setText("Evidence has been modified."); - msgBox->setInformativeText("Do you want to save your changes?"); + msgBox->setText(tr("Evidence has been modified.")); + msgBox->setInformativeText(tr("Do you want to save your changes?")); msgBox->setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel); msgBox->setDefaultButton(QMessageBox::Save); @@ -657,7 +656,7 @@ void Courtroom::on_evidence_transfer_clicked() } QMessageBox *msgBox = new QMessageBox; - msgBox->setText("\"" + name + "\" has been transferred."); + msgBox->setText(tr("\"%1\" has been transferred.").arg(name)); msgBox->setStandardButtons(QMessageBox::Ok); msgBox->setDefaultButton(QMessageBox::Ok); msgBox->exec(); @@ -759,9 +758,9 @@ void Courtroom::on_evidence_load_clicked() continue; evi_type f_evi; - f_evi.name = inventory.value(evi + "/name", "UNKNOWN").value(); + f_evi.name = inventory.value(evi + "/name", tr("UNKNOWN")).value(); f_evi.description = - inventory.value(evi + "/description", "UNKNOWN").value(); + inventory.value(evi + "/description", tr("UNKNOWN")).value(); f_evi.image = inventory.value(evi + "/image", "UNKNOWN.png").value(); local_evidence_list.append(f_evi); diff --git a/src/lobby.cpp b/src/lobby.cpp index 81e4086..91c4b7c 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); @@ -36,7 +36,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); @@ -139,7 +139,7 @@ void Lobby::set_widgets() ui_server_search->setStyleSheet("background-color: rgba(0, 0, 0, 0);"); 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;"); @@ -173,11 +173,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(); @@ -377,7 +377,7 @@ void Lobby::on_about_clicked() "Noevain, Cronnicossy, the AO2 community, server hosts, game masters," "case makers, content creators and players!") .arg(ao_app->get_version_string()); - QMessageBox::about(this, "About", msg); + QMessageBox::about(this, tr("About"), msg); } void Lobby::on_settings_clicked() { ao_app->call_settings_menu(); } diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index a7bdbab..44e2816 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -232,7 +232,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 = ""; @@ -260,7 +260,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; @@ -313,9 +313,9 @@ 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);