Skip to content

Commit 3e38da6

Browse files
authored
fix: remove HTML from reset confirmation translations (anomalyco#1398)
Co-authored-by: src-opn <[email protected]>
1 parent 46fa5a2 commit 3e38da6

7 files changed

Lines changed: 23 additions & 8 deletions

File tree

‎apps/app/src/app/components/reset-modal.tsx‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import { Match, Show, Switch } from "solid-js";
22

33
import { X } from "lucide-solid";
4-
import { t, currentLocale, type Language } from "../../i18n";
4+
import { t, type Language } from "../../i18n";
55

66
import Button from "./button";
77
import TextInput from "./text-input";
88

9+
const RESET_CONFIRM_PLACEHOLDER = "{resetWord}";
10+
const RESET_CONFIRM_WORD = "RESET";
11+
912
export type ResetModalProps = {
1013
open: boolean;
1114
mode: "onboarding" | "all";
@@ -21,6 +24,18 @@ export type ResetModalProps = {
2124

2225
export default function ResetModal(props: ResetModalProps) {
2326
const translate = (key: string) => t(key, props.language);
27+
const resetConfirmationHint = () => {
28+
const template = translate("settings.reset_confirmation_hint");
29+
const parts = template.split(RESET_CONFIRM_PLACEHOLDER);
30+
31+
if (parts.length === 1) return template;
32+
33+
return parts.flatMap((part, index) =>
34+
index < parts.length - 1
35+
? [part, <span class="font-mono">{RESET_CONFIRM_WORD}</span>]
36+
: [part],
37+
);
38+
};
2439

2540
return (
2641
<Show when={props.open}>
@@ -35,7 +50,7 @@ export default function ResetModal(props: ResetModalProps) {
3550
<Match when={true}>{translate("settings.reset_app_data_title")}</Match>
3651
</Switch>
3752
</h3>
38-
<p class="text-sm text-gray-11 mt-1" innerHTML={translate("settings.reset_confirmation_hint")} />
53+
<p class="text-sm text-gray-11 mt-1">{resetConfirmationHint()}</p>
3954
</div>
4055
<Button
4156
variant="ghost"

‎apps/app/src/i18n/locales/en.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ export default {
15741574
"settings.reset_config_defaults": "Resetting...",
15751575
"settings.reset_config_failed": "Failed to reset app config.",
15761576
"settings.reset_confirm_button": "Reset & Restart",
1577-
"settings.reset_confirmation_hint": "Type <span class=\"font-mono\">RESET</span> to confirm. OpenWork will restart.",
1577+
"settings.reset_confirmation_hint": "Type {resetWord} to confirm. OpenWork will restart.",
15781578
"settings.reset_confirmation_label": "Confirmation",
15791579
"settings.reset_confirmation_placeholder": "Type RESET",
15801580
"settings.reset_onboarding": "Reset onboarding",

‎apps/app/src/i18n/locales/ja.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1573,7 +1573,7 @@ export default {
15731573
"settings.reset_config_defaults": "リセット中…",
15741574
"settings.reset_config_failed": "アプリ設定のリセットに失敗しました。",
15751575
"settings.reset_confirm_button": "リセットして再起動",
1576-
"settings.reset_confirmation_hint": "確認のため <span class=\"font-mono\">RESET</span> と入力してください。OpenWorkが再起動されます。",
1576+
"settings.reset_confirmation_hint": "確認のため {resetWord} と入力してください。OpenWorkが再起動されます。",
15771577
"settings.reset_confirmation_label": "確認",
15781578
"settings.reset_confirmation_placeholder": "RESETと入力",
15791579
"settings.reset_onboarding": "オンボーディングをリセット",

‎apps/app/src/i18n/locales/pt-BR.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ export default {
15741574
"settings.reset_config_defaults": "Redefinindo...",
15751575
"settings.reset_config_failed": "Falha ao redefinir configurações do app.",
15761576
"settings.reset_confirm_button": "Redefinir e Reiniciar",
1577-
"settings.reset_confirmation_hint": "Digite <span class=\"font-mono\">RESET</span> para confirmar. O OpenWork será reiniciado.",
1577+
"settings.reset_confirmation_hint": "Digite {resetWord} para confirmar. O OpenWork será reiniciado.",
15781578
"settings.reset_confirmation_label": "Confirmação",
15791579
"settings.reset_confirmation_placeholder": "Digite RESET",
15801580
"settings.reset_onboarding": "Redefinir onboarding",

‎apps/app/src/i18n/locales/th.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ export default {
15741574
"settings.reset_config_defaults": "กำลังรีเซ็ต...",
15751575
"settings.reset_config_failed": "รีเซ็ต app config ไม่สำเร็จ",
15761576
"settings.reset_confirm_button": "รีเซ็ตและรีสตาร์ท",
1577-
"settings.reset_confirmation_hint": "พิมพ์ <span class=\"font-mono\">RESET</span> เพื่อยืนยัน OpenWork จะรีสตาร์ท",
1577+
"settings.reset_confirmation_hint": "พิมพ์ {resetWord} เพื่อยืนยัน OpenWork จะรีสตาร์ท",
15781578
"settings.reset_confirmation_label": "การยืนยัน",
15791579
"settings.reset_confirmation_placeholder": "พิมพ์ RESET",
15801580
"settings.reset_onboarding": "รีเซ็ต onboarding",

‎apps/app/src/i18n/locales/vi.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,7 +1574,7 @@ export default {
15741574
"settings.reset_config_defaults": "Đang đặt lại...",
15751575
"settings.reset_config_failed": "Đặt lại cấu hình ứng dụng thất bại.",
15761576
"settings.reset_confirm_button": "Đặt lại & Khởi động lại",
1577-
"settings.reset_confirmation_hint": "Nhập <span class=\"font-mono\">RESET</span> để xác nhận. OpenWork sẽ khởi động lại.",
1577+
"settings.reset_confirmation_hint": "Nhập {resetWord} để xác nhận. OpenWork sẽ khởi động lại.",
15781578
"settings.reset_confirmation_label": "Xác nhận",
15791579
"settings.reset_confirmation_placeholder": "Nhập RESET",
15801580
"settings.reset_onboarding": "Đặt lại thiết lập ban đầu",

‎apps/app/src/i18n/locales/zh.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1577,7 +1577,7 @@ export default {
15771577
"settings.reset_config_defaults": "正在重置…",
15781578
"settings.reset_config_failed": "重置应用配置失败。",
15791579
"settings.reset_confirm_button": "重置并重启",
1580-
"settings.reset_confirmation_hint": "输入 <span class=\"font-mono\">RESET</span> 以确认。OpenWork将重启。",
1580+
"settings.reset_confirmation_hint": "输入 {resetWord} 以确认。OpenWork将重启。",
15811581
"settings.reset_confirmation_label": "确认",
15821582
"settings.reset_confirmation_placeholder": "输入RESET",
15831583
"settings.reset_onboarding": "重置入门",

0 commit comments

Comments
 (0)