diff --git a/src/game/client/gametextcommon.cpp b/src/game/client/gametextcommon.cpp index 4df36e850..3bcfcb3f8 100644 --- a/src/game/client/gametextcommon.cpp +++ b/src/game/client/gametextcommon.cpp @@ -32,9 +32,9 @@ constexpr const char *const s_localization___ = ""; constexpr const char *const s_localization_bp = "Brazilian"; constexpr const char *const s_localization_pl = "Polish"; constexpr const char *const s_localization_uk = "Unknown"; -constexpr const char *const s_localization_ru = "Russian"; constexpr const char *const s_localization_ar = "Arabic"; -constexpr const char *const s_localization_se = "Swedish"; +constexpr const char *const s_localization_ru = "Russian"; +constexpr const char *const s_localization_sv = "Swedish"; constexpr const char *const s_localizations[] = { s_localization_us, @@ -51,9 +51,9 @@ constexpr const char *const s_localizations[] = { s_localization_bp, s_localization_pl, s_localization_uk, - s_localization_ru, s_localization_ar, - s_localization_se, + s_localization_ru, + s_localization_sv, }; static_assert(s_localization_us == s_localizations[size_t(LanguageID::US)]); @@ -70,9 +70,9 @@ static_assert(s_localization___ == s_localizations[size_t(LanguageID::UNUSED_1)] static_assert(s_localization_bp == s_localizations[size_t(LanguageID::BRAZILIAN)]); static_assert(s_localization_pl == s_localizations[size_t(LanguageID::POLISH)]); static_assert(s_localization_uk == s_localizations[size_t(LanguageID::UNKNOWN)]); -static_assert(s_localization_ru == s_localizations[size_t(LanguageID::RUSSIAN)]); static_assert(s_localization_ar == s_localizations[size_t(LanguageID::ARABIC)]); -static_assert(s_localization_se == s_localizations[size_t(LanguageID::SWEDISH)]); +static_assert(s_localization_ru == s_localizations[size_t(LanguageID::RUSSIAN)]); +static_assert(s_localization_sv == s_localizations[size_t(LanguageID::SWEDISH)]); static_assert(ARRAY_SIZE(s_localizations) == g_languageCount); diff --git a/src/game/client/gametextcommon.h b/src/game/client/gametextcommon.h index ff237ec5a..53148b65d 100644 --- a/src/game/client/gametextcommon.h +++ b/src/game/client/gametextcommon.h @@ -42,8 +42,8 @@ enum class LanguageID : int32_t UNKNOWN = 13, // Community game languages. - RUSSIAN = 14, - ARABIC = 15, + ARABIC = 14, + RUSSIAN = 15, SWEDISH = 16, COUNT diff --git a/src/game/client/gametextfile.cpp b/src/game/client/gametextfile.cpp index 93d558f75..54a265d90 100644 --- a/src/game/client/gametextfile.cpp +++ b/src/game/client/gametextfile.cpp @@ -120,9 +120,9 @@ constexpr const char *const s_langcode___ = s_langcode_invalid; constexpr const char *const s_langcode_bp = "BP"; constexpr const char *const s_langcode_pl = "PL"; constexpr const char *const s_langcode_uk = s_langcode_invalid; -constexpr const char *const s_langcode_ru = "RU"; constexpr const char *const s_langcode_ar = "AR"; -constexpr const char *const s_langcode_se = "SE"; +constexpr const char *const s_langcode_ru = "RU"; +constexpr const char *const s_langcode_sv = "SV"; constexpr const char *const s_langcodes[] = { s_langcode_us, @@ -139,9 +139,9 @@ constexpr const char *const s_langcodes[] = { s_langcode_bp, s_langcode_pl, s_langcode_uk, - s_langcode_ru, s_langcode_ar, - s_langcode_se, + s_langcode_ru, + s_langcode_sv, }; static_assert(s_langcode_us == s_langcodes[size_t(LanguageID::US)]); @@ -158,9 +158,10 @@ static_assert(s_langcode___ == s_langcodes[size_t(LanguageID::UNUSED_1)]); static_assert(s_langcode_bp == s_langcodes[size_t(LanguageID::BRAZILIAN)]); static_assert(s_langcode_pl == s_langcodes[size_t(LanguageID::POLISH)]); static_assert(s_langcode_uk == s_langcodes[size_t(LanguageID::UNKNOWN)]); -static_assert(s_langcode_ru == s_langcodes[size_t(LanguageID::RUSSIAN)]); static_assert(s_langcode_ar == s_langcodes[size_t(LanguageID::ARABIC)]); -static_assert(s_langcode_se == s_langcodes[size_t(LanguageID::SWEDISH)]); +static_assert(s_langcode_ru == s_langcodes[size_t(LanguageID::RUSSIAN)]); +static_assert(s_langcode_sv == s_langcodes[size_t(LanguageID::SWEDISH)]); + static_assert(ARRAY_SIZE(s_langcodes) == g_languageCount); constexpr const char *Get_Language_Code(LanguageID language) diff --git a/src/tools/gametextcompiler/src/main.cpp b/src/tools/gametextcompiler/src/main.cpp index dbc1b791b..1ef9a3f56 100644 --- a/src/tools/gametextcompiler/src/main.cpp +++ b/src/tools/gametextcompiler/src/main.cpp @@ -102,7 +102,7 @@ FILE_PATH takes any relative or absolute path. LANGUAGE:enum LANGUAGE takes one [1] or multiple [n] languages, separated by pipe: -All|English|German|French|Spanish|Italian|Japanese|Korean|Chinese|Brazilian|Polish|Unknown|Russian|Arabic|Swedish +All|English|German|French|Spanish|Italian|Japanese|Korean|Chinese|Brazilian|Polish|Unknown|Arabic|Russian|Swedish OPTION:enum OPTION takes one [1] or multiple [n] options, separated by pipe: