summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAmeer J <52414509+ameerj@users.noreply.github.com>2021-07-29 20:41:03 +0200
committerGitHub <noreply@github.com>2021-07-29 20:41:03 +0200
commit23b3333f725d986bbe5ecf4715caef94aa7b0e4a (patch)
tree49ba5da4fe2eed4cdaeef7612998851ed9b6106a /src/core
parentMerge pull request #6742 from Morph1984/uuid (diff)
parentservice: ns: Remove unused ns_language header (diff)
downloadyuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.tar
yuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.tar.gz
yuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.tar.bz2
yuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.tar.lz
yuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.tar.xz
yuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.tar.zst
yuzu-23b3333f725d986bbe5ecf4715caef94aa7b0e4a.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/ns/language.cpp2
-rw-r--r--src/core/hle/service/ns/ns_language.h42
2 files changed, 2 insertions, 42 deletions
diff --git a/src/core/hle/service/ns/language.cpp b/src/core/hle/service/ns/language.cpp
index 29c4a820c..54b644830 100644
--- a/src/core/hle/service/ns/language.cpp
+++ b/src/core/hle/service/ns/language.cpp
@@ -344,8 +344,10 @@ std::optional<ApplicationLanguage> ConvertToApplicationLanguage(
return ApplicationLanguage::Russian;
case Set::LanguageCode::KO:
return ApplicationLanguage::Korean;
+ case Set::LanguageCode::ZH_TW:
case Set::LanguageCode::ZH_HANT:
return ApplicationLanguage::TraditionalChinese;
+ case Set::LanguageCode::ZH_CN:
case Set::LanguageCode::ZH_HANS:
return ApplicationLanguage::SimplifiedChinese;
default:
diff --git a/src/core/hle/service/ns/ns_language.h b/src/core/hle/service/ns/ns_language.h
deleted file mode 100644
index 59ac85a19..000000000
--- a/src/core/hle/service/ns/ns_language.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2019 yuzu emulator team
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-#include <optional>
-#include <string>
-#include "common/common_types.h"
-#include "core/hle/service/set/set.h"
-
-namespace Service::NS {
-/// This is nn::ns::detail::ApplicationLanguage
-enum class ApplicationLanguage : u8 {
- AmericanEnglish = 0,
- BritishEnglish,
- Japanese,
- French,
- German,
- LatinAmericanSpanish,
- Spanish,
- Italian,
- Dutch,
- CanadianFrench,
- Portuguese,
- Russian,
- Korean,
- TraditionalChinese,
- SimplifiedChinese,
- Count
-};
-using ApplicationLanguagePriorityList =
- const std::array<ApplicationLanguage, static_cast<std::size_t>(ApplicationLanguage::Count)>;
-
-constexpr u32 GetSupportedLanguageFlag(const ApplicationLanguage lang) {
- return 1U << static_cast<u32>(lang);
-}
-
-const ApplicationLanguagePriorityList* GetApplicationLanguagePriorityList(ApplicationLanguage lang);
-std::optional<ApplicationLanguage> ConvertToApplicationLanguage(
- Service::Set::LanguageCode language_code);
-std::optional<Service::Set::LanguageCode> ConvertToLanguageCode(ApplicationLanguage lang);
-} // namespace Service::NS \ No newline at end of file