Skip to content

LanguagePreferenceFragment: Add "System default" option #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theimpulson merged 1 commit into from
Mar 13, 2025
+14 −1
Merged

LanguagePreferenceFragment: Add "System default" option #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ class LanguagePreferenceFragment : DialogFragment() {
layoutManager = LinearLayoutManager(requireContext())
adapter = LanguagePreferenceAdapter(
items = listOf(
LanguageOptionItem(
languageTag = "x-default",
localName = requireContext().getString(R.string.lang_translated_name_x_default),
translatedName = requireContext().getString(R.string.lang_translated_name_x_default)
),
LanguageOptionItem(
languageTag = "en-US",
localName = requireContext().getString(R.string.lang_local_name_en_us),
Expand Down Expand Up @@ -78,7 +83,13 @@ class LanguagePreferenceFragment : DialogFragment() {
) { item ->
dialog?.dismiss()
AppCompatDelegate.setApplicationLocales(
LocaleListCompat.forLanguageTags(item.languageTag)
(
if (item.languageTag == "x-default") {
LocaleListCompat.getEmptyLocaleList()
} else {
LocaleListCompat.forLanguageTags(item.languageTag)
}
)
)
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
<string name="failed_to_save_wifi_copied_to_clipboard">無法儲存 Wi-Fi 網路資訊。網路密碼已複製到剪貼簿。</string>
<string name="switch_language">切換語言</string>
<string name="choose_app_language">選擇應用程式語言</string>
<string name="lang_translated_name_x_default">系統預設</string>
<string name="lang_translated_name_en_us">英語</string>
<string name="lang_translated_name_nan_hant_tw">閩南語 - 傳統漢字</string>
<string name="lang_translated_name_nan_latn_tw_pehoeji">閩南語 - 白話字</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<string name="failed_to_save_wifi_copied_to_clipboard">Failed to save the Wi-Fi information. Password copied to clipboard.</string>
<string name="switch_language">Switch language</string>
<string name="choose_app_language">Choose app language</string>
<string name="lang_translated_name_x_default">System default</string>
<string name="lang_local_name_en_us" translatable="false">English</string>
<string name="lang_translated_name_en_us">English</string>
<string name="lang_local_name_nan_hant_tw" translatable="false">閩南語 - 傳統漢字</string>
Expand Down