From 6c5b9f8851b815460a7998e4c7ba22492cff0b2e Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 21 Jan 2023 09:10:57 +0800
Subject: [PATCH] Add nb-rNO to supported languages

---
 app/build.gradle                                               | 2 +-
 .../java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt    | 3 +--
 app/src/main/res/values/arrays.xml                             | 2 ++
 app/src/main/res/values/strings.xml                            | 1 +
 app/src/main/res/xml/locales_config.xml                        | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2d8ffb1e8..0148f7baf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,7 +34,7 @@ android {
         targetSdkVersion 33
         versionCode 180030
         versionName "1.8.5.3-rc01"
-        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
+        resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th', 'nb-rNO'
     }
 
     externalNativeBuild {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
index 3de584837..2a41abc21 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
@@ -231,7 +231,6 @@ class AdvancedFragment : BasePreferenceFragment() {
         addPreferencesFromResource(R.xml.advanced_settings)
         val dumpLogcat = findPreference<Preference>(KEY_DUMP_LOGCAT)
         val appLanguage = findPreference<Preference>(KEY_APP_LANGUAGE)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) appLanguage!!.isVisible = false
         val importData = findPreference<Preference>(KEY_IMPORT_DATA)
         val exportData = findPreference<Preference>(KEY_EXPORT_DATA)
         val backupFavorite = findPreference<Preference>(KEY_BACKUP_FAVORITE)
@@ -378,7 +377,7 @@ class AdvancedFragment : BasePreferenceFragment() {
 
     override fun onPreferenceChange(preference: Preference, newValue: Any): Boolean {
         val key = preference.key
-        if (KEY_APP_LANGUAGE == key && Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        if (KEY_APP_LANGUAGE == key) {
             if ("system" == newValue) {
                 AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
             } else {
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 92dc00701..93eba382b 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -195,6 +195,7 @@
         <item>@string/app_language_zh_cn</item>
         <item>@string/app_language_zh_hk</item>
         <item>@string/app_language_zh_tw</item>
+        <item>@string/app_language_nb_no</item>
     </string-array>
 
     <string-array name="app_language_entry_values">
@@ -209,6 +210,7 @@
         <item>zh-CN</item>
         <item>zh-HK</item>
         <item>zh-TW</item>
+        <item>nb-rNO</item>
     </string-array>
 
     <string-array name="tag_translation_metadata" tools:ignore="InconsistentArrays">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f362dec1b..27ad8695b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,6 +478,7 @@
     <string name="app_language_zh_cn" translatable="false">中文（大陆）</string>
     <string name="app_language_zh_hk" translatable="false">中文（香港）</string>
     <string name="app_language_zh_tw" translatable="false">國文（臺灣）</string>
+    <string name="app_language_nb_no" translatable="false">Norwegian Bokmål</string>
     <!-- ExcludedLanguagesScene -->
     <string name="please_wait">Pleas wait</string>
     <!-- License -->
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index f8d42c789..c1d6bdf79 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -26,4 +26,5 @@
     <locale android:name="zh-CN" />
     <locale android:name="zh-HK" />
     <locale android:name="zh-TW" />
+    <locale android:name="nb-NO" />
 </locale-config>