diff --git a/enjoy/src/i18n/en.json b/enjoy/src/i18n/en.json index e43177ff..c49ff233 100644 --- a/enjoy/src/i18n/en.json +++ b/enjoy/src/i18n/en.json @@ -531,8 +531,8 @@ "AiTranslate": "AI translate", "cambridgeDictionary": "Cambridge dictionary", "customizeShortcuts": "Customize shortcuts", - "customizeShortcutsTip":"Click to change", - "customizeShortcutsRecordingTip":"Recording new shortcut", + "customizeShortcutsTip": "Click to change", + "customizeShortcutsRecordingTip": "Recording new shortcut", "customizeShortcutsInvalidToast": "Your shortcut should only have one modifier (Ctrl, Alt, Shift, or Meta) and one key, like 'Ctrl+C'.", "customizeShortcutsConflictToast": "{{input}} conflicts with the existing {{otherHotkeyName}} shortcut.", "customizeShortcutsUpdated": "Changes saved", diff --git a/enjoy/src/i18n/zh-CN.json b/enjoy/src/i18n/zh-CN.json index 98b5abdc..d12b7a9d 100644 --- a/enjoy/src/i18n/zh-CN.json +++ b/enjoy/src/i18n/zh-CN.json @@ -530,9 +530,9 @@ "AiTranslate": "智能翻译", "cambridgeDictionary": "剑桥词典", "customizeShortcuts": "自定义快捷键", - "customizeShortcutsTip":"点击重新录制", - "customizeShortcutsRecordingTip":"正在录制快捷键", - "customizeShortcutsInvalidToast":"快捷键应最多含一个修饰键(Ctrl, Alt, Shift 或 Meta)和一个键,如 'Ctrl+C'", + "customizeShortcutsTip": "点击重新录制", + "customizeShortcutsRecordingTip": "正在录制快捷键", + "customizeShortcutsInvalidToast": "快捷键应最多含一个修饰键(Ctrl, Alt, Shift 或 Meta)和一个键,如 'Ctrl+C'", "customizeShortcutsConflictToast": "{{input}} 和已有 {{otherHotkeyName}} 的键位冲突了", "customizeShortcutsUpdated": "设置成功", "following": "关注中", diff --git a/enjoy/src/renderer/components/preferences/email-settings.tsx b/enjoy/src/renderer/components/preferences/email-settings.tsx index 74b4bc31..76a7ef0e 100644 --- a/enjoy/src/renderer/components/preferences/email-settings.tsx +++ b/enjoy/src/renderer/components/preferences/email-settings.tsx @@ -17,7 +17,7 @@ export const EmailSettings = () => { const { user, login, webApi } = useContext(AppSettingsProviderContext); const [editing, setEditing] = useState(false); const [email, setEmail] = useState(user.email); - const [code, setCode] = useState(''); + const [code, setCode] = useState(""); const [codeSent, setCodeSent] = useState(false); const [countdown, setCountdown] = useState(0); @@ -38,7 +38,7 @@ export const EmailSettings = () => { return () => { if (timeout) clearTimeout(timeout); - } + }; }, [countdown]); if (!user) return null; @@ -47,78 +47,89 @@ export const EmailSettings = () => {
{t("email")}
-
{user.email || '-'}
+
+ {user.email || "-"} +
setEditing(value)}> - - {t('editEmail')} - + {t("editEmail")}
- + setEmail(e.target.value)} - placeholder="m@example.com" /> + onChange={(e) => setEmail(e.target.value)} + placeholder="m@example.com" + />
- + setCode(e.target.value)} - placeholder={t('verificationCode')} + onChange={(e) => setCode(e.target.value)} + placeholder={t("verificationCode")} />
- - +
diff --git a/enjoy/src/renderer/components/preferences/user-settings.tsx b/enjoy/src/renderer/components/preferences/user-settings.tsx index 8ba27ce7..dbbcd1c0 100644 --- a/enjoy/src/renderer/components/preferences/user-settings.tsx +++ b/enjoy/src/renderer/components/preferences/user-settings.tsx @@ -27,7 +27,9 @@ import { useContext, useState } from "react"; import { redirect } from "react-router-dom"; export const UserSettings = () => { - const { user, login, logout, webApi } = useContext(AppSettingsProviderContext); + const { user, login, logout, webApi } = useContext( + AppSettingsProviderContext + ); const [name, setName] = useState(user.name); const [editing, setEditing] = useState(false); @@ -66,12 +68,12 @@ export const UserSettings = () => { - {t('editUserName')} + {t("editUserName")}
- + { />
- +
@@ -97,7 +105,11 @@ export const UserSettings = () => { -