opensource/certimate
3
0
Fork 0
mirror of https://github.com/certimate-go/certimate.git synced 2026-09-24 23:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): i18n detection shows incorrect result

Browse Source
This commit is contained in:
Fu Diwei
2025-09-13 16:12:12 +08:00
parent 01a32bc446
commit 0f9bf32158
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/components/AppLocale.tsx
+4 -4
View File
@@ -15,7 +15,7 @@ export const useAppLocaleMenuItems = () => {
key: key as string,
label: i18n.store.data[key].name as string,
onClick: () => {
if (key !== i18n.language) {
if (key !== (i18n.resolvedLanguage ?? i18n.language)) {
i18n.changeLanguage(key);
window.location.reload();
}
@@ -48,10 +48,10 @@ const AppLocaleIcon = (props: AppLocaleIconProps) => {
return (
<Show>
<Show.Case when={i18n.language === localeNames.EN}>
<Show.Case when={(i18n.resolvedLanguage ?? i18n.language) === localeNames.EN}>
<IconLanguageEnZh {...props} />
</Show.Case>
<Show.Case when={i18n.language === localeNames.ZH}>
<Show.Case when={(i18n.resolvedLanguage ?? i18n.language) === localeNames.ZH}>
<IconLanguageZhEn {...props} />
</Show.Case>
<Show.Default>
@@ -76,7 +76,7 @@ const AppLocaleLinkButton = ({ className, style, showIcon = true }: AppLocaleLin
<Typography.Text className={mergeCls("cursor-pointer", className)} style={style} type="secondary">
<div className="flex items-center justify-center space-x-1">
{showIcon ? <AppLocaleIcon size="1em" /> : <></>}
<span>{String(localeResources[i18n.language]?.name ?? t("common.menu.locale"))}</span>
<span>{String(localeResources[i18n.resolvedLanguage ?? i18n.language]?.name ?? t("common.menu.locale"))}</span>
</div>
</Typography.Text>
</AppLocaleDropdown>
ui/src/pages/settings/SettingsAppearance.tsx
+2 -2
View File
@@ -75,7 +75,7 @@ const SettingsAppearanceLanguage = ({ className, style }: { className?: string;
const [localeChanged, setLocaleChanged] = useState(false);
const handleChange = (value: string) => {
if (value !== i18n.language) {
if (value !== (i18n.resolvedLanguage ?? i18n.language)) {
setLocaleChanged(true);
i18n.changeLanguage(value);
}
@@ -91,7 +91,7 @@ const SettingsAppearanceLanguage = ({ className, style }: { className?: string;
value: item.key,
label: item.label,
}))}
value={i18n.language}
value={i18n.resolvedLanguage ?? i18n.language}
onChange={handleChange}
/>
</Form.Item>