Browse Source

Rename Korean/Romanian translation files so they are used in fallback resolution

pull/3893/head
ephphatha 4 years ago committed by Anders Jenbo
parent
commit
6a1091ce09
  1. 2
      CMake/Assets.cmake
  2. 4
      Source/options.cpp
  3. 2
      Source/platform/ctr/locale.cpp
  4. 2
      Source/utils/language.cpp
  5. 2
      Translations/ko.po
  6. 2
      Translations/ro.po

2
CMake/Assets.cmake

@ -2,7 +2,7 @@ if(NOT DEFINED DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY)
set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/assets") set(DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/assets")
endif() endif()
set(devilutionx_langs bg cs da de es fr hr it ja ko_KR pl pt_BR ro_RO ru uk sv zh_CN zh_TW) set(devilutionx_langs bg cs da de es fr hr it ja ko pl pt_BR ro ru uk sv zh_CN zh_TW)
if(USE_GETTEXT_FROM_VCPKG) if(USE_GETTEXT_FROM_VCPKG)
# vcpkg doesn't add its own tools directory to the search path # vcpkg doesn't add its own tools directory to the search path
list(APPEND Gettext_ROOT ${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/tools/gettext/bin) list(APPEND Gettext_ROOT ${CMAKE_CURRENT_BINARY_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}/tools/gettext/bin)

4
Source/options.cpp

@ -976,12 +976,12 @@ void OptionEntryLanguageCode::CheckLanguagesAreInitialized() const
if (font_mpq) { if (font_mpq) {
languages.emplace_back("ja", "日本語"); languages.emplace_back("ja", "日本語");
languages.emplace_back("ko_KR", "한국어"); languages.emplace_back("ko", "한국어");
} }
languages.emplace_back("pl", "Polski"); languages.emplace_back("pl", "Polski");
languages.emplace_back("pt_BR", "Português do Brasil"); languages.emplace_back("pt_BR", "Português do Brasil");
languages.emplace_back("ro_RO", "Română"); languages.emplace_back("ro", "Română");
languages.emplace_back("ru", "Русский"); languages.emplace_back("ru", "Русский");
languages.emplace_back("sv", "Svenska"); languages.emplace_back("sv", "Svenska");
languages.emplace_back("uk", "Українська"); languages.emplace_back("uk", "Українська");

2
Source/platform/ctr/locale.cpp

@ -34,7 +34,7 @@ std::string GetLocale()
case CFG_LANGUAGE_ZH: case CFG_LANGUAGE_ZH:
return "zh_CN"; return "zh_CN";
case CFG_LANGUAGE_KO: case CFG_LANGUAGE_KO:
return "ko_KR"; return "ko";
case CFG_LANGUAGE_NL: case CFG_LANGUAGE_NL:
return "nl"; return "nl";
case CFG_LANGUAGE_PT: case CFG_LANGUAGE_PT:

2
Source/utils/language.cpp

@ -94,7 +94,7 @@ void SetPluralForm(char *string)
expression = StrTrimRight(expression); expression = StrTrimRight(expression);
expression = StrTrimLeft(expression); expression = StrTrimLeft(expression);
// ko_KR, zh_CN, zh_TW // ko, zh_CN, zh_TW
if (strcmp(expression, "0") == 0) { if (strcmp(expression, "0") == 0) {
GetLocalPluralId = [](int /*n*/) -> int { return 0; }; GetLocalPluralId = [](int /*n*/) -> int { return 0; };
return; return;

2
Translations/ko_KR.po → Translations/ko.po

@ -5,7 +5,7 @@ msgstr ""
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: NSM53PROJECT <nsm53project@gmail.com>\n" "Last-Translator: NSM53PROJECT <nsm53project@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: ko_KR\n" "Language: ko\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"

2
Translations/ro_RO.po → Translations/ro.po

@ -5,7 +5,7 @@ msgstr ""
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: ro_RO\n" "Language: ro\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
Loading…
Cancel
Save