diff options
| author | bunnei <bunneidev@gmail.com> | 2022-08-10 01:09:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 01:09:14 +0200 |
| commit | 15df026d04fe093aed67b7f1a8114aea842e97bd (patch) | |
| tree | f81d05ce614ea97b9930df9923dccbf49d4ad72e /src | |
| parent | Merge pull request #8715 from Docteh/suzhou (diff) | |
| parent | Translate english plurals (diff) | |
| download | yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.tar yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.tar.gz yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.tar.bz2 yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.tar.lz yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.tar.xz yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.tar.zst yuzu-15df026d04fe093aed67b7f1a8114aea842e97bd.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_ui.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index f6b389ede..50007338f 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -221,6 +221,9 @@ if (ENABLE_QT_TRANSLATION) # Update source TS file if enabled if (GENERATE_QT_TRANSLATION) get_target_property(SRCS yuzu SOURCES) + # these calls to qt_create_translation also creates a rule to generate en.qm which conflicts with providing english plurals + # so we have to set a OUTPUT_LOCATION so that we don't have multiple rules to generate en.qm + set_source_files_properties(${YUZU_QT_LANGUAGES}/en.ts PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/translations") qt_create_translation(QM_FILES ${SRCS} ${UIS} @@ -229,7 +232,13 @@ if (ENABLE_QT_TRANSLATION) -source-language en_US -target-language en_US ) - add_custom_target(translation ALL DEPENDS ${YUZU_QT_LANGUAGES}/en.ts) + + # Generate plurals into dist/english_plurals/generated_en.ts so it can be used to revise dist/english_plurals/en.ts + set(GENERATED_PLURALS_FILE ${PROJECT_SOURCE_DIR}/dist/english_plurals/generated_en.ts) + set_source_files_properties(${GENERATED_PLURALS_FILE} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/plurals") + qt_create_translation(QM_FILES ${SRCS} ${UIS} ${GENERATED_PLURALS_FILE} OPTIONS -pluralonly -source-language en_US -target-language en_US) + + add_custom_target(translation ALL DEPENDS ${YUZU_QT_LANGUAGES}/en.ts ${GENERATED_PLURALS_FILE}) endif() # Find all TS files except en.ts @@ -239,6 +248,9 @@ if (ENABLE_QT_TRANSLATION) # Compile TS files to QM files qt_add_translation(LANGUAGES_QM ${LANGUAGES_TS}) + # Compile english plurals TS file to en.qm + qt_add_translation(LANGUAGES_QM ${PROJECT_SOURCE_DIR}/dist/english_plurals/en.ts) + # Build a QRC file from the QM file list set(LANGUAGES_QRC ${CMAKE_CURRENT_BINARY_DIR}/languages.qrc) file(WRITE ${LANGUAGES_QRC} "<RCC><qresource prefix=\"languages\">\n") diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp index 2e98ede8e..48f71b53c 100644 --- a/src/yuzu/configuration/configure_ui.cpp +++ b/src/yuzu/configuration/configure_ui.cpp @@ -219,6 +219,7 @@ void ConfigureUi::InitializeLanguageComboBox() { for (const auto& lang : languages) { if (QString::fromLatin1(lang.id) == QStringLiteral("en")) { ui->language_combobox->addItem(lang.name, QStringLiteral("en")); + language_files.removeOne(QStringLiteral("en.qm")); continue; } for (int i = 0; i < language_files.size(); ++i) { diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 378b40205..f82bec3b7 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -3980,11 +3980,6 @@ void GMainWindow::UpdateUITheme() { } void GMainWindow::LoadTranslation() { - // If the selected language is English, no need to install any translation - if (UISettings::values.language == QStringLiteral("en")) { - return; - } - bool loaded; if (UISettings::values.language.isEmpty()) { |