Skip to content

Fix Swedish language code #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: Add-Swedish
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/game/client/gametextcommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)]);
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/game/client/gametextcommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions src/game/client/gametextfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)]);
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/tools/gametextcompiler/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down