Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-10 05:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[core] Fix language index mismatches (#3629)

Browse source 
For reasons I am not knowledgeable enough to answer, NACP language and
nn::settings::Language don't match.

PR #3587 however erroneously matched language_index directly to NACP
language which caused those weird mismatches (since idx 2 = French
actually matches up to an NACP language of Japanese). So to get around
that just go back to the mapping of language idx -> nacp language

Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3629
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: DraVee <dravee@eden-emu.dev>
This commit is contained in:
crueter 2026-02-25 00:41:21 +01:00
parent 5279e76534
commit 7758f70833
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
1 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/core/file_sys/control_metadata.cpp
View file

@ -108,7 +108,34 @@ NACP::NACP(VirtualFile file)
NACP::~NACP() = default;
const LanguageEntry& NACP::GetLanguageEntry() const {
u32 index = static_cast<u32>(Settings::values.language_index.GetValue());
auto const language = []{
switch (Settings::values.language_index.GetValue()) {
case Settings::Language::Chinese: return Language::SimplifiedChinese;
case Settings::Language::ChineseSimplified: return Language::SimplifiedChinese;
case Settings::Language::ChineseTraditional: return Language::TraditionalChinese;
case Settings::Language::Dutch: return Language::Dutch;
case Settings::Language::EnglishAmerican: return Language::AmericanEnglish;
case Settings::Language::EnglishBritish: return Language::BritishEnglish;
case Settings::Language::French: return Language::French;
case Settings::Language::FrenchCanadian: return Language::CanadianFrench;
case Settings::Language::German: return Language::German;
case Settings::Language::Italian: return Language::Italian;
case Settings::Language::Korean: return Language::Korean;
case Settings::Language::Japanese: return Language::Japanese;
case Settings::Language::Portuguese: return Language::Portuguese;
case Settings::Language::PortugueseBrazilian: return Language::BrazilianPortuguese;
case Settings::Language::Russian: return Language::Russian;
case Settings::Language::Spanish: return Language::Spanish;
case Settings::Language::SpanishLatin: return Language::LatinAmericanSpanish;
case Settings::Language::Taiwanese: return Language::SimplifiedChinese;
case Settings::Language::Thai: return Language::Thai;
case Settings::Language::Polish: return Language::Polish;
default: return Language::AmericanEnglish;
}
}();
u32 index = u32(language);
if (index < language_entries.size() && !language_entries[index].GetApplicationName().empty()) {
return language_entries[index];