diff --git a/app/shared/app-lang/src/androidMain/res/values-zh-rCN/strings.xml b/app/shared/app-lang/src/androidMain/res/values-zh-rCN/strings.xml index 3aca3943db..798f1438ba 100644 --- a/app/shared/app-lang/src/androidMain/res/values-zh-rCN/strings.xml +++ b/app/shared/app-lang/src/androidMain/res/values-zh-rCN/strings.xml @@ -501,6 +501,15 @@ 退出登录 已退出登录 账号 + + + 未登录 + 编辑个人资料 + 登录 / 注册 + 退出登录 + 确定要退出登录吗？ + 退出登录 + 取消 diff --git a/app/shared/app-lang/src/androidMain/res/values-zh-rHK/strings.xml b/app/shared/app-lang/src/androidMain/res/values-zh-rHK/strings.xml index a358687339..c9db724779 100644 --- a/app/shared/app-lang/src/androidMain/res/values-zh-rHK/strings.xml +++ b/app/shared/app-lang/src/androidMain/res/values-zh-rHK/strings.xml @@ -479,7 +479,19 @@ 僅緩存最近看過的番劇 緩存數量 當前設置: 僅緩存最近看過的 %d 部番劇 - 管理已緩存的劇集登出已登出賬戶 + 管理已緩存的劇集 + 登出 + 已登出 + 賬戶 + + + 未登入 + 編輯個人資料 + 登入 / 註冊 + 登出 + 確定要登出嗎？ + 登出 + 取消 版本過期 diff --git a/app/shared/app-lang/src/androidMain/res/values-zh-rTW/strings.xml b/app/shared/app-lang/src/androidMain/res/values-zh-rTW/strings.xml index 23f5258e25..78811ca046 100644 --- a/app/shared/app-lang/src/androidMain/res/values-zh-rTW/strings.xml +++ b/app/shared/app-lang/src/androidMain/res/values-zh-rTW/strings.xml @@ -479,7 +479,19 @@ 僅快取最近看過的番劇 快取數量 目前設定: 僅快取最近看過的 %d 部番劇 - 管理已快取的劇集登出已登出賬戶 + 管理已快取的劇集 + 登出 + 已登出 + 賬戶 + + + 未登入 + 編輯個人資料 + 登入 / 註冊 + 登出 + 確定要登出嗎？ + 登出 + 取消 diff --git a/app/shared/app-lang/src/androidMain/res/values/strings.xml b/app/shared/app-lang/src/androidMain/res/values/strings.xml index 25685eb461..77e6e72cd0 100644 --- a/app/shared/app-lang/src/androidMain/res/values/strings.xml +++ b/app/shared/app-lang/src/androidMain/res/values/strings.xml @@ -463,6 +463,15 @@ Logout Logged out Account + + + Not logged in + Edit profile + Login / Register + Logout + Are you sure you want to logout? + Logout + Cancel diff --git a/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopup.kt b/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopup.kt index a354d86dc0..efd730e702 100644 --- a/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopup.kt +++ b/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopup.kt @@ -48,6 +48,11 @@ import me.him188.ani.app.ui.foundation.layout.currentWindowAdaptiveInfo1 import me.him188.ani.app.ui.foundation.layout.isHeightAtLeastMedium import me.him188.ani.app.ui.foundation.layout.isWidthAtLeastMedium import me.him188.ani.app.ui.foundation.rememberAsyncHandler +import me.him188.ani.app.ui.lang.Lang +import me.him188.ani.app.ui.lang.settings_account_popup_cancel +import me.him188.ani.app.ui.lang.settings_account_popup_logout_button +import me.him188.ani.app.ui.lang.settings_account_popup_logout_confirm +import org.jetbrains.compose.resources.stringResource /** * 在右上角显示的个人信息弹窗 @@ -163,15 +168,15 @@ fun AccountLogoutDialog( AlertDialog( onCancel, icon = { Icon(Icons.AutoMirrored.Outlined.Logout, null) }, - text = { Text("确定要退出登录吗?") }, + text = { Text(stringResource(Lang.settings_account_popup_logout_confirm)) }, confirmButton = { TextButton(onConfirm, enabled = confirmEnabled) { - Text("退出登录", color = MaterialTheme.colorScheme.error) + Text(stringResource(Lang.settings_account_popup_logout_button), color = MaterialTheme.colorScheme.error) } }, dismissButton = { TextButton(onCancel) { - Text("取消") + Text(stringResource(Lang.settings_account_popup_cancel)) } }, ) diff --git a/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopupLayout.kt b/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopupLayout.kt index 1a72a02b4f..a83424fc50 100644 --- a/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopupLayout.kt +++ b/app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopupLayout.kt @@ -51,9 +51,16 @@ import me.him188.ani.app.ui.foundation.avatar.AvatarImage import me.him188.ani.app.ui.foundation.interaction.hoverable import me.him188.ani.app.ui.foundation.text.ProvideContentColor import me.him188.ani.app.ui.foundation.widgets.HeroIcon +import me.him188.ani.app.ui.lang.Lang +import me.him188.ani.app.ui.lang.settings +import me.him188.ani.app.ui.lang.settings_account_popup_edit_profile +import me.him188.ani.app.ui.lang.settings_account_popup_login_register +import me.him188.ani.app.ui.lang.settings_account_popup_logout +import me.him188.ani.app.ui.lang.settings_account_popup_not_logged_in import me.him188.ani.app.ui.settings.SettingsTab import me.him188.ani.app.ui.settings.framework.components.TextItem import me.him188.ani.app.ui.user.SelfInfoUiState +import org.jetbrains.compose.resources.stringResource @Composable internal fun ProfilePopupLayout( @@ -88,7 +95,7 @@ internal fun ProfilePopupLayout( val showEmail = false Text( - if (isLogin) title else "未登录", + if (isLogin) title else stringResource(Lang.settings_account_popup_not_logged_in), style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold, modifier = Modifier @@ -128,14 +135,14 @@ internal fun ProfilePopupLayout( icon = { Icon(Icons.Outlined.Edit, contentDescription = "Edit profile settings") }, onClick = onClickEditProfile, ) { - Text("编辑个人资料") + Text(stringResource(Lang.settings_account_popup_edit_profile)) } } else { TextItem( icon = { Icon(Icons.AutoMirrored.Outlined.Login, contentDescription = "Login") }, onClick = onClickLogin, ) { - Text("登录 / 注册") + Text(stringResource(Lang.settings_account_popup_login_register)) } } @@ -143,7 +150,7 @@ internal fun ProfilePopupLayout( icon = { Icon(Icons.Outlined.Settings, contentDescription = "Settings") }, onClick = onClickSettings, ) { - Text("设置") + Text(stringResource(Lang.settings)) } if (isLogin) { @@ -159,7 +166,7 @@ internal fun ProfilePopupLayout( onClick = onClickLogout, ) { ProvideContentColor(MaterialTheme.colorScheme.error) { - Text("退出登录") + Text(stringResource(Lang.settings_account_popup_logout)) } } }