misc: Polish localization updates

This commit is contained in:
Marcin Mitura 2024-11-21 12:59:19 +01:00
parent 5054827441
commit 1b6fe88cd2
7 changed files with 1896 additions and 1530 deletions

View File

@ -153,7 +153,7 @@ add_subdirectory(externals)
include_directories(src) include_directories(src)
if(ENABLE_QT_GUI) if(ENABLE_QT_GUI)
find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent LinguistTools Network Multimedia) find_package(Qt6 REQUIRED COMPONENTS Core Widgets Concurrent LinguistTools Network Multimedia)
qt_standard_project_setup() qt_standard_project_setup()
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
@ -853,7 +853,7 @@ else()
endif() endif()
if (ENABLE_QT_GUI) if (ENABLE_QT_GUI)
target_link_libraries(shadps4 PRIVATE Qt6::Widgets Qt6::Concurrent Qt6::Network Qt6::Multimedia) target_link_libraries(shadps4 PRIVATE Qt6::Core Qt6::Widgets Qt6::Concurrent Qt6::Network Qt6::Multimedia)
add_definitions(-DENABLE_QT_GUI) add_definitions(-DENABLE_QT_GUI)
if (ENABLE_UPDATER) if (ENABLE_UPDATER)
add_definitions(-DENABLE_UPDATER) add_definitions(-DENABLE_UPDATER)

View File

@ -61,7 +61,11 @@ void TrophyUI::Draw() {
GetColorU32(ImVec4{0.7f})); GetColorU32(ImVec4{0.7f}));
ImGui::Indent(60); ImGui::Indent(60);
} }
TextWrapped("Trophy earned!\n%s", trophy_name.c_str());
TextWrapped(QString(QObject::tr("Trophy earned!\n%1"))
.arg(QString::fromStdString(trophy_name))
.toStdString()
.c_str());
} }
End(); End();

View File

@ -3,8 +3,10 @@
#pragma once #pragma once
#include <filesystem>
#include <string> #include <string>
#include <variant> #include <variant>
#include <QObject>
#include <queue> #include <queue>
#include "common/fixed_value.h" #include "common/fixed_value.h"
@ -15,9 +17,10 @@
namespace Libraries::NpTrophy { namespace Libraries::NpTrophy {
class TrophyUI final : public ImGui::Layer { // Ensure that TrophyUI is a QObject-derived class
public: class TrophyUI final : public QObject, public ImGui::Layer {
TrophyUI(const std::filesystem::path& trophyIconPath, const std::string& trophyName); Q_OBJECT // This is the necessary macro for Qt's meta-object system
public : TrophyUI(const std::filesystem::path& trophyIconPath, const std::string& trophyName);
~TrophyUI() override; ~TrophyUI() override;
void Finish(); void Finish();

View File

@ -4,16 +4,16 @@
#pragma once #pragma once
#include <QDialog> #include <QDialog>
#include "common/config.h" #include "common/config.h"
#include "common/path_util.h" #include "common/path_util.h"
class QLineEdit; class QLineEdit;
class GameInstallDialog final : public QDialog { class GameInstallDialog final : public QDialog {
public: Q_OBJECT // Necessary macro for QObject-derived classes using Qt's meta-object system
GameInstallDialog();
~GameInstallDialog(); public : GameInstallDialog();
~GameInstallDialog() override;
private slots: private slots:
void BrowseGamesDirectory(); void BrowseGamesDirectory();

View File

@ -749,6 +749,8 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
tr("PKG and Game versions match: ") + pkg_app_version + tr("PKG and Game versions match: ") + pkg_app_version +
"\n" + tr("Would you like to overwrite?"))); "\n" + tr("Would you like to overwrite?")));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setButtonText(QMessageBox::Yes, tr("Yes"));
msgBox.setButtonText(QMessageBox::No, tr("No"));
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
} else if (pkgD < appD) { } else if (pkgD < appD) {
msgBox.setText(QString(tr("Patch detected!") + "\n" + msgBox.setText(QString(tr("Patch detected!") + "\n" +
@ -757,6 +759,8 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
game_app_version + "\n" + game_app_version + "\n" +
tr("Would you like to overwrite?"))); tr("Would you like to overwrite?")));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setButtonText(QMessageBox::Yes, tr("Yes"));
msgBox.setButtonText(QMessageBox::No, tr("No"));
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
} else { } else {
msgBox.setText(QString(tr("Patch detected!") + "\n" + msgBox.setText(QString(tr("Patch detected!") + "\n" +
@ -764,6 +768,8 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
tr("Would you like to install Patch: ") + tr("Would you like to install Patch: ") +
pkg_app_version + " ?")); pkg_app_version + " ?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setButtonText(QMessageBox::Yes, tr("Yes"));
msgBox.setButtonText(QMessageBox::No, tr("No"));
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
} }
int result = msgBox.exec(); int result = msgBox.exec();
@ -781,6 +787,8 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
addonMsgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); addonMsgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
addonMsgBox.setDefaultButton(QMessageBox::No); addonMsgBox.setDefaultButton(QMessageBox::No);
addonMsgBox.setButtonText(QMessageBox::Yes, tr("Yes"));
addonMsgBox.setButtonText(QMessageBox::No, tr("No"));
int result = addonMsgBox.exec(); int result = addonMsgBox.exec();
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
game_update_path = addon_extract_path; game_update_path = addon_extract_path;
@ -792,6 +800,8 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
"\n\n" + tr("Would you like to overwrite?"))); "\n\n" + tr("Would you like to overwrite?")));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
msgBox.setButtonText(QMessageBox::Yes, tr("Yes"));
msgBox.setButtonText(QMessageBox::No, tr("No"));
int result = msgBox.exec(); int result = msgBox.exec();
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {
game_update_path = addon_extract_path; game_update_path = addon_extract_path;
@ -803,6 +813,8 @@ void MainWindow::InstallDragDropPkg(std::filesystem::path file, int pkgNum, int
msgBox.setText(QString(tr("Game already installed") + "\n" + gameDirPath + "\n" + msgBox.setText(QString(tr("Game already installed") + "\n" + gameDirPath + "\n" +
tr("Would you like to overwrite?"))); tr("Would you like to overwrite?")));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setButtonText(QMessageBox::Yes, tr("Yes"));
msgBox.setButtonText(QMessageBox::No, tr("No"));
msgBox.setDefaultButton(QMessageBox::No); msgBox.setDefaultButton(QMessageBox::No);
int result = msgBox.exec(); int result = msgBox.exec();
if (result == QMessageBox::Yes) { if (result == QMessageBox::Yes) {

View File

@ -15,37 +15,37 @@
#include "settings_dialog.h" #include "settings_dialog.h"
#include "ui_settings_dialog.h" #include "ui_settings_dialog.h"
QStringList languageNames = {"Arabic", QStringList languageNames = {QObject::tr("Arabic"),
"Czech", QObject::tr("Czech"),
"Danish", QObject::tr("Danish"),
"Dutch", QObject::tr("Dutch"),
"English (United Kingdom)", QObject::tr("English (United Kingdom)"),
"English (United States)", QObject::tr("English (United States)"),
"Finnish", QObject::tr("Finnish"),
"French (Canada)", QObject::tr("French (Canada)"),
"French (France)", QObject::tr("French (France)"),
"German", QObject::tr("German"),
"Greek", QObject::tr("Greek"),
"Hungarian", QObject::tr("Hungarian"),
"Indonesian", QObject::tr("Indonesian"),
"Italian", QObject::tr("Italian"),
"Japanese", QObject::tr("Japanese"),
"Korean", QObject::tr("Korean"),
"Norwegian (Bokmaal)", QObject::tr("Norwegian (Bokmaal)"),
"Polish", QObject::tr("Polish"),
"Portuguese (Brazil)", QObject::tr("Portuguese (Brazil)"),
"Portuguese (Portugal)", QObject::tr("Portuguese (Portugal)"),
"Romanian", QObject::tr("Romanian"),
"Russian", QObject::tr("Russian"),
"Simplified Chinese", QObject::tr("Simplified Chinese"),
"Spanish (Latin America)", QObject::tr("Spanish (Latin America)"),
"Spanish (Spain)", QObject::tr("Spanish (Spain)"),
"Swedish", QObject::tr("Swedish"),
"Thai", QObject::tr("Thai"),
"Traditional Chinese", QObject::tr("Traditional Chinese"),
"Turkish", QObject::tr("Turkish"),
"Ukrainian", QObject::tr("Ukrainian"),
"Vietnamese"}; QObject::tr("Vietnamese")};
const QVector<int> languageIndexes = {21, 23, 14, 6, 18, 1, 12, 22, 2, 4, 25, 24, 29, 5, 0, 9, const QVector<int> languageIndexes = {21, 23, 14, 6, 18, 1, 12, 22, 2, 4, 25, 24, 29, 5, 0, 9,
15, 16, 17, 7, 26, 8, 11, 20, 3, 13, 27, 10, 19, 30, 28}; 15, 16, 17, 7, 26, 8, 11, 20, 3, 13, 27, 10, 19, 30, 28};
@ -60,7 +60,7 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus(); ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
// Add list of available GPUs // Add list of available GPUs
ui->graphicsAdapterBox->addItem("Auto Select"); // -1, auto selection ui->graphicsAdapterBox->addItem(tr("Auto Select")); // -1, auto selection
for (const auto& device : physical_devices) { for (const auto& device : physical_devices) {
ui->graphicsAdapterBox->addItem(device); ui->graphicsAdapterBox->addItem(device);
} }

File diff suppressed because it is too large Load Diff