Skip to content

Commit 88e232b

Browse files
authored
Merge pull request #103 from winstonsung/dev-103
LanguagePreferenceFragment: Add "System default" option
2 parents e6203da + e0b6fe6 commit 88e232b

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ class LanguagePreferenceFragment : DialogFragment() {
3434
layoutManager = LinearLayoutManager(requireContext())
3535
adapter = LanguagePreferenceAdapter(
3636
items = listOf(
37+
LanguageOptionItem(
38+
languageTag = "x-default",
39+
localName = requireContext().getString(R.string.lang_translated_name_x_default),
40+
translatedName = requireContext().getString(R.string.lang_translated_name_x_default)
41+
),
3742
LanguageOptionItem(
3843
languageTag = "en-US",
3944
localName = requireContext().getString(R.string.lang_local_name_en_us),
@@ -78,7 +83,13 @@ class LanguagePreferenceFragment : DialogFragment() {
7883
) { item ->
7984
dialog?.dismiss()
8085
AppCompatDelegate.setApplicationLocales(
81-
LocaleListCompat.forLanguageTags(item.languageTag)
86+
(
87+
if (item.languageTag == "x-default") {
88+
LocaleListCompat.getEmptyLocaleList()
89+
} else {
90+
LocaleListCompat.forLanguageTags(item.languageTag)
91+
}
92+
)
8293
)
8394
}
8495
}

app/src/main/res/values-zh-rTW/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<string name="failed_to_save_wifi_copied_to_clipboard">無法儲存 Wi-Fi 網路資訊。網路密碼已複製到剪貼簿。</string>
9696
<string name="switch_language">切換語言</string>
9797
<string name="choose_app_language">選擇應用程式語言</string>
98+
<string name="lang_translated_name_x_default">系統預設</string>
9899
<string name="lang_translated_name_en_us">英語</string>
99100
<string name="lang_translated_name_nan_hant_tw">閩南語 - 傳統漢字</string>
100101
<string name="lang_translated_name_nan_latn_tw_pehoeji">閩南語 - 白話字</string>

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<string name="failed_to_save_wifi_copied_to_clipboard">Failed to save the Wi-Fi information. Password copied to clipboard.</string>
9797
<string name="switch_language">Switch language</string>
9898
<string name="choose_app_language">Choose app language</string>
99+
<string name="lang_translated_name_x_default">System default</string>
99100
<string name="lang_local_name_en_us" translatable="false">English</string>
100101
<string name="lang_translated_name_en_us">English</string>
101102
<string name="lang_local_name_nan_hant_tw" translatable="false">閩南語 - 傳統漢字</string>

0 commit comments

Comments
 (0)