N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-23 07:12:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7244 from Morph1984/application-lang-pt-br

Browse source 
file_sys/ns: Add Brazilian Portuguese to the list of ApplicationLanguage
This commit is contained in:
bunnei 2021-10-29 22:32:38 -07:00 committed by GitHub
commit 7c2c72a6d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@
namespace FileSys { namespace FileSys {
const std::array<const char*, 15> LANGUAGE_NAMES{{ const std::array<const char*, 16> LANGUAGE_NAMES{{
"AmericanEnglish", "AmericanEnglish",
"BritishEnglish", "BritishEnglish",
"Japanese", "Japanese",
@ -25,6 +25,7 @@ const std::array<const char*, 15> LANGUAGE_NAMES{{
"Korean", "Korean",
"Taiwanese", "Taiwanese",
"Chinese", "Chinese",
"BrazilianPortuguese",
}}; }};
std::string LanguageEntry::GetApplicationName() const { std::string LanguageEntry::GetApplicationName() const {

3
src/core/file_sys/control_metadata.h
View file

@ -88,11 +88,12 @@ enum class Language : u8 {
Korean = 12, Korean = 12,
Taiwanese = 13, Taiwanese = 13,
Chinese = 14, Chinese = 14,
BrazilianPortuguese = 15,
Default = 255, Default = 255,
}; };
extern const std::array<const char*, 15> LANGUAGE_NAMES; extern const std::array<const char*, 16> LANGUAGE_NAMES;
// A class representing the format used by NX metadata files, typically named Control.nacp. // A class representing the format used by NX metadata files, typically named Control.nacp.
// These store application name, dev name, title id, and other miscellaneous data. // These store application name, dev name, title id, and other miscellaneous data.

26
src/core/hle/service/ns/language.cpp
View file

@ -277,6 +277,25 @@ constexpr ApplicationLanguagePriorityList priority_list_simplified_chinese = {{
ApplicationLanguage::Korean, ApplicationLanguage::Korean,
}}; }};
constexpr ApplicationLanguagePriorityList priority_list_brazilian_portuguese = {{
ApplicationLanguage::BrazilianPortuguese,
ApplicationLanguage::Portuguese,
ApplicationLanguage::LatinAmericanSpanish,
ApplicationLanguage::AmericanEnglish,
ApplicationLanguage::BritishEnglish,
ApplicationLanguage::Japanese,
ApplicationLanguage::French,
ApplicationLanguage::German,
ApplicationLanguage::Spanish,
ApplicationLanguage::Italian,
ApplicationLanguage::Dutch,
ApplicationLanguage::CanadianFrench,
ApplicationLanguage::Russian,
ApplicationLanguage::Korean,
ApplicationLanguage::SimplifiedChinese,
ApplicationLanguage::TraditionalChinese,
}};
const ApplicationLanguagePriorityList* GetApplicationLanguagePriorityList( const ApplicationLanguagePriorityList* GetApplicationLanguagePriorityList(
const ApplicationLanguage lang) { const ApplicationLanguage lang) {
switch (lang) { switch (lang) {
@ -310,6 +329,8 @@ const ApplicationLanguagePriorityList* GetApplicationLanguagePriorityList(
return &priority_list_traditional_chinese; return &priority_list_traditional_chinese;
case ApplicationLanguage::SimplifiedChinese: case ApplicationLanguage::SimplifiedChinese:
return &priority_list_simplified_chinese; return &priority_list_simplified_chinese;
case ApplicationLanguage::BrazilianPortuguese:
return &priority_list_brazilian_portuguese;
default: default:
return nullptr; return nullptr;
} }
@ -339,7 +360,6 @@ std::optional<ApplicationLanguage> ConvertToApplicationLanguage(
case Set::LanguageCode::FR_CA: case Set::LanguageCode::FR_CA:
return ApplicationLanguage::CanadianFrench; return ApplicationLanguage::CanadianFrench;
case Set::LanguageCode::PT: case Set::LanguageCode::PT:
case Set::LanguageCode::PT_BR:
return ApplicationLanguage::Portuguese; return ApplicationLanguage::Portuguese;
case Set::LanguageCode::RU: case Set::LanguageCode::RU:
return ApplicationLanguage::Russian; return ApplicationLanguage::Russian;
@ -351,6 +371,8 @@ std::optional<ApplicationLanguage> ConvertToApplicationLanguage(
case Set::LanguageCode::ZH_CN: case Set::LanguageCode::ZH_CN:
case Set::LanguageCode::ZH_HANS: case Set::LanguageCode::ZH_HANS:
return ApplicationLanguage::SimplifiedChinese; return ApplicationLanguage::SimplifiedChinese;
case Set::LanguageCode::PT_BR:
return ApplicationLanguage::BrazilianPortuguese;
default: default:
return std::nullopt; return std::nullopt;
} }
@ -388,6 +410,8 @@ std::optional<Set::LanguageCode> ConvertToLanguageCode(const ApplicationLanguage
return Set::LanguageCode::ZH_HANT; return Set::LanguageCode::ZH_HANT;
case ApplicationLanguage::SimplifiedChinese: case ApplicationLanguage::SimplifiedChinese:
return Set::LanguageCode::ZH_HANS; return Set::LanguageCode::ZH_HANS;
case ApplicationLanguage::BrazilianPortuguese:
return Set::LanguageCode::PT_BR;
default: default:
return std::nullopt; return std::nullopt;
} }

1
src/core/hle/service/ns/language.h
View file

@ -30,6 +30,7 @@ enum class ApplicationLanguage : u8 {
Korean, Korean,
TraditionalChinese, TraditionalChinese,
SimplifiedChinese, SimplifiedChinese,
BrazilianPortuguese,
Count Count
}; };
using ApplicationLanguagePriorityList = using ApplicationLanguagePriorityList =