From 7d1c7663bc992dd21a025cea6894b9062f95c525 Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 15 Dec 2024 16:42:59 +0100 Subject: [PATCH 1/2] fix: format channel name (#117) Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/117 Co-authored-by: septs Co-committed-by: septs --- .../src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt | 4 ++-- .../main/java/im/angry/openeuicc/ui/NotificationsActivity.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt index 36031dd..aca2572 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccInfoActivity.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.launch import net.typeblog.lpac_jni.impl.PKID_GSMA_LIVE_CI import net.typeblog.lpac_jni.impl.PKID_GSMA_TEST_CI -class EuiccInfoActivity : BaseEuiccAccessActivity() { +class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker { companion object { private val YES_NO = Pair(R.string.yes, R.string.no) } @@ -64,7 +64,7 @@ class EuiccInfoActivity : BaseEuiccAccessActivity() { val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) { getString(R.string.usb) } else { - getString(R.string.channel_name_format, logicalSlotId) + appContainer.customizableTextProvider.formatInternalChannelName(logicalSlotId) } title = getString(R.string.euicc_info_activity_title, channelTitle) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt index c2a1a0f..21a2d40 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt @@ -62,7 +62,7 @@ class NotificationsActivity: BaseEuiccAccessActivity(), OpenEuiccContextMarker { val channelTitle = if (logicalSlotId == EuiccChannelManager.USB_CHANNEL_ID) { getString(R.string.usb) } else { - getString(R.string.channel_name_format, logicalSlotId) + appContainer.customizableTextProvider.formatInternalChannelName(logicalSlotId) } title = getString(R.string.profile_notifications_detailed_format, channelTitle) From 456754db5d66d4fd0828d9c9a2492fc566e2c2d3 Mon Sep 17 00:00:00 2001 From: septs Date: Sun, 15 Dec 2024 16:46:06 +0100 Subject: [PATCH 2/2] fix: move language switcher component name in advanced category (#118) Co-authored-by: Peter Cai Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/118 Co-authored-by: septs Co-committed-by: septs --- .../src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt | 2 +- app-common/src/main/res/values-ja/strings.xml | 4 ++-- app-common/src/main/res/values-zh-rCN/strings.xml | 4 ++-- app-common/src/main/res/values/strings.xml | 4 ++-- app-common/src/main/res/xml/pref_settings.xml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt index cb801af..ef4ef8b 100644 --- a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt +++ b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt @@ -45,7 +45,7 @@ open class SettingsFragment: PreferenceFragmentCompat() { setOnPreferenceClickListener(::onAppVersionClicked) } - findPreference("pref_language")?.apply { + findPreference("pref_advanced_language")?.apply { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return@apply isVisible = true intent = Intent(Settings.ACTION_APP_LOCALE_SETTINGS).apply { diff --git a/app-common/src/main/res/values-ja/strings.xml b/app-common/src/main/res/values-ja/strings.xml index 7d99cb7..dacfd68 100644 --- a/app-common/src/main/res/values-ja/strings.xml +++ b/app-common/src/main/res/values-ja/strings.xml @@ -125,8 +125,8 @@ 情報 アプリバージョン ソースコード - 言語 - アプリの言語を選択 + 言語 + アプリの言語を選択 すべてのプロファイルを表示 プロダクション以外のプロファイルも表示する タイプ: diff --git a/app-common/src/main/res/values-zh-rCN/strings.xml b/app-common/src/main/res/values-zh-rCN/strings.xml index 551435b..b97969d 100644 --- a/app-common/src/main/res/values-zh-rCN/strings.xml +++ b/app-common/src/main/res/values-zh-rCN/strings.xml @@ -126,8 +126,8 @@ 否 还有 %d 步成为开发者 你现在是开发者了！ - 语言 - 选择 App 语言 + 语言 + 选择 App 语言 开发者选项 显示未经过滤的配置文件列表 在配置文件列表中包括非生产环境的配置文件 diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml index e349c68..bd3b3af 100644 --- a/app-common/src/main/res/values/strings.xml +++ b/app-common/src/main/res/values/strings.xml @@ -153,8 +153,8 @@ By default, this app prevents you from disabling the active profile on a removable eSIM inserted in the device, because doing so may sometimes render it inaccessible.\nCheck this box to remove this safeguard. Verbose Logging Enable verbose logs, which may contain sensitive information. Only share your logs with someone you trust after turning this on. - Language - Select app language + Language + Select app language Logs View recent debug logs of the application Developer Options diff --git a/app-common/src/main/res/xml/pref_settings.xml b/app-common/src/main/res/xml/pref_settings.xml index 1da1fd4..bb5bd50 100644 --- a/app-common/src/main/res/xml/pref_settings.xml +++ b/app-common/src/main/res/xml/pref_settings.xml @@ -40,9 +40,9 @@ + app:key="pref_advanced_language" + app:summary="@string/pref_advanced_language_desc" + app:title="@string/pref_advanced_language" />