Skip to content

fix(i18n): replace hardcoded strings in ProfilePopupLayout with i18n … #2944

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
StageGuard merged 2 commits into from
Apr 28, 2026
Merged

fix(i18n): replace hardcoded strings in ProfilePopupLayout with i18n … #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8cd18d
fix(i18n): replace hardcoded strings in ProfilePopupLayout with i18n …
wellorbetter Apr 6, 2026
aa58194
fix(i18n): add missing imports for i18n extension properties in Profi…
wellorbetter Apr 8, 2026
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
9 changes: 9 additions & 0 deletions app/shared/app-lang/src/androidMain/res/values-zh-rCN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,15 @@
<string name="settings_debug_logout">退出登录</string>
<string name="settings_debug_logged_out">已退出登录</string>
<string name="settings_tab_account">账号</string>

<!-- Account Popup -->
<string name="settings_account_popup_not_logged_in">未登录</string>
<string name="settings_account_popup_edit_profile">编辑个人资料</string>
<string name="settings_account_popup_login_register">登录 / 注册</string>
<string name="settings_account_popup_logout">退出登录</string>
<string name="settings_account_popup_logout_confirm">确定要退出登录吗？</string>
<string name="settings_account_popup_logout_button">退出登录</string>
<string name="settings_account_popup_cancel">取消</string>
</resources>

<!--@formatter:on-->
14 changes: 13 additions & 1 deletion app/shared/app-lang/src/androidMain/res/values-zh-rHK/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,19 @@
<string name="settings_media_auto_cache_recent_only">僅緩存最近看過的番劇</string>
<string name="settings_media_auto_cache_count">緩存數量</string>
<string name="settings_media_auto_cache_count_description">當前設置: 僅緩存最近看過的 %d 部番劇</string>
<string name="settings_media_auto_cache_manage">管理已緩存的劇集</string><string name="settings_debug_logout">登出</string><string name="settings_debug_logged_out">已登出</string><string name="settings_tab_account">賬戶</string>
<string name="settings_media_auto_cache_manage">管理已緩存的劇集</string>
<string name="settings_debug_logout">登出</string>
<string name="settings_debug_logged_out">已登出</string>
<string name="settings_tab_account">賬戶</string>

<!-- Account Popup -->
<string name="settings_account_popup_not_logged_in">未登入</string>
<string name="settings_account_popup_edit_profile">編輯個人資料</string>
<string name="settings_account_popup_login_register">登入 / 註冊</string>
<string name="settings_account_popup_logout">登出</string>
<string name="settings_account_popup_logout_confirm">確定要登出嗎？</string>
<string name="settings_account_popup_logout_button">登出</string>
<string name="settings_account_popup_cancel">取消</string>

<!-- Version Expired Overlay -->
<string name="settings_update_version_expired_title">版本過期</string>
Expand Down
14 changes: 13 additions & 1 deletion app/shared/app-lang/src/androidMain/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,19 @@
<string name="settings_media_auto_cache_recent_only">僅快取最近看過的番劇</string>
<string name="settings_media_auto_cache_count">快取數量</string>
<string name="settings_media_auto_cache_count_description">目前設定: 僅快取最近看過的 %d 部番劇</string>
<string name="settings_media_auto_cache_manage">管理已快取的劇集</string><string name="settings_debug_logout">登出</string><string name="settings_debug_logged_out">已登出</string><string name="settings_tab_account">賬戶</string>
<string name="settings_media_auto_cache_manage">管理已快取的劇集</string>
<string name="settings_debug_logout">登出</string>
<string name="settings_debug_logged_out">已登出</string>
<string name="settings_tab_account">賬戶</string>

<!-- Account Popup -->
<string name="settings_account_popup_not_logged_in">未登入</string>
<string name="settings_account_popup_edit_profile">編輯個人資料</string>
<string name="settings_account_popup_login_register">登入 / 註冊</string>
<string name="settings_account_popup_logout">登出</string>
<string name="settings_account_popup_logout_confirm">確定要登出嗎？</string>
<string name="settings_account_popup_logout_button">登出</string>
<string name="settings_account_popup_cancel">取消</string>
</resources>

<!--@formatter:on-->
9 changes: 9 additions & 0 deletions app/shared/app-lang/src/androidMain/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,15 @@
<string name="settings_debug_logout">Logout</string>
<string name="settings_debug_logged_out">Logged out</string>
<string name="settings_tab_account">Account</string>

<!-- Account Popup -->
<string name="settings_account_popup_not_logged_in">Not logged in</string>
<string name="settings_account_popup_edit_profile">Edit profile</string>
<string name="settings_account_popup_login_register">Login / Register</string>
<string name="settings_account_popup_logout">Logout</string>
<string name="settings_account_popup_logout_confirm">Are you sure you want to logout?</string>
<string name="settings_account_popup_logout_button">Logout</string>
<string name="settings_account_popup_cancel">Cancel</string>
</resources>

<!--@formatter:on-->
11 changes: 8 additions & 3 deletions app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

/**
* 在右上角显示的个人信息弹窗
Expand Down Expand Up @@ -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))
}
},
)
Expand Down
17 changes: 12 additions & 5 deletions app/shared/ui-settings/src/commonMain/kotlin/ui/settings/account/ProfilePopupLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -128,22 +135,22 @@ 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))
}
}

TextItem(
icon = { Icon(Icons.Outlined.Settings, contentDescription = "Settings") },
onClick = onClickSettings,
) {
Text("设置")
Text(stringResource(Lang.settings))
}

if (isLogin) {
Expand All @@ -159,7 +166,7 @@ internal fun ProfilePopupLayout(
onClick = onClickLogout,
) {
ProvideContentColor(MaterialTheme.colorScheme.error) {
Text("退出登录")
Text(stringResource(Lang.settings_account_popup_logout))
}
}
}
Expand Down
Loading