dsh-calendar 0.10.0 → 0.10.1

package/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 [历史英文记录](docs/CHANGELOG.en.md)
 
+## 0.10.1 (2026-10-03)
+
+- 修复语言切换时菜单和悬浮按钮不更新；日期、星期、重复规则、ICS 告警与连接引导支持英文。
+- 验收范围见 [中英文界面检查](docs/validation-language-2026-10-03.md)。
+
 ## 0.10.0 (2026-10-03)
 
 - 新增 ICS 导入：选择文件或粘贴内容，预览后自行勾选、分批确认；保留重复规则、排除日期、改期例外和时区定义。

package/docs/VALIDATION.md

@@ -1,5 +1,7 @@
 # dsh-calendar 验证记录
 
+[0.10.1 中英文界面验收](validation-language-2026-10-03.md)。
+
 本页整理原 README 的历史验证说明，保留当时的版本、日期与范围。自动测试、启动检查、浏览器操作和真实服务验收分别记录，不能相互替代。更详细的版本验收文件仍保留在仓库中。
 
 ## 当前版本

package/docs/validation-language-2026-10-03.md

@@ -0,0 +1,16 @@
+# 0.10.1：中英文界面验收
+
+2026-10-03，Windows / Node 24.16.0。采用 E 盘独立 DSH_HOME、合成资料与无密钥 profile；用户资料、账号、密钥、桌面窗口与 VPN 保持原状。
+
+- 自动测试：192 项全部通过。
+- 可见 Web 操作：英文 ICS 粘贴预览，选择 Asia/Shanghai 后事件可选；浮动时间、DTSTAMP 与缺少连接凭据的引导为英文，事件标题保留中文。示例日历中的日期、星期和重复详情为英文；中文切换时导航与独立悬浮按钮及时更新。
+- 宿主：官方 DSH 0.2.1-alpha.1 Web；官方 RC2 与 alpha SDK 同载 18 组件，110 工具、35 插件技能、19 输出样例注册与 schema 检查通过。无账号的健康结果不代表真实连接。
+- 边界：未导入真实 CalDAV 账号；无账号时的连接引导通过不能等同于服务连接通过。
+
+中英文共用同一份资料；界面翻译不会改写标题、正文、路径、引用或项目文件。系统文件选择控件和文件对话框跟随 Windows / 浏览器语言。未知技术诊断与原始引擎日志保留原文；英文界面提供操作恢复引导。
+
+此记录不代表原生桌面窗口内的新功能已逐项操作通过。发布包完整性、GitHub CI 与公开 npm 全新安装在发布时另行核对。
+
+## English scope
+
+The Chinese and English UI share the same data. UI translation preserves original content, paths and project files. Visible interactions were performed in an isolated official alpha Web profile; both RC2 and alpha SDK registration/schema checks passed. Native file controls use the OS/browser language, and original diagnostic logs are retained. Browser results do not certify native desktop interaction or real-service delivery.

package/lib/client.js

@@ -333,6 +333,62 @@ const UI = {
 
 var UI_LANG = "zh";
 var relocalize = null;
+var activeLocaleService = null;
+
+// Backend guidance is localized separately from event titles and source content.
+const BACKEND_EN = {
+  "日期格式不合法": "Invalid date format.",
+  "日程包含不存在的日期或时间": "This event contains an invalid date or time.",
+  "请先选择或粘贴 ICS 文件内容": "Choose an ICS file or paste its content first.",
+  "ICS 文件超过 256 KiB，请分批导出": "The ICS file exceeds 256 KiB. Export smaller batches.",
+  "ICS 结构不合法或嵌套过深": "The ICS structure is invalid or nested too deeply.",
+  "ICS 文件不完整": "The ICS file is incomplete.",
+  "无法读取 ICS，请从日历应用重新导出": "Could not read the ICS file. Export it again from your calendar app.",
+  "暂不支持 PERIOD 类型的 RDATE，请改用日期列表后导入": "PERIOD RDATE values are unsupported. Export a list of dates instead.",
+  "全天日期不能含 TZID": "All-day dates must not contain TZID.",
+  "文件含未标注时区的时间，请选择解释时区后重新预览": "This file contains times without a timezone. Choose an interpretation timezone and preview again.",
+  "UTC 时间不能同时标注 TZID": "UTC timestamps must not also contain TZID.",
+  "原文件缺少 DTSTAMP，导入时补齐": "DTSTAMP is missing and will be added during import.",
+  "作为私人日程复制，不导入参与者或发送邀请": "Imported as a private copy. Attendees are omitted and no invitations are sent.",
+  "仅保留屏幕提醒，已移除其他提醒动作": "Only display reminders are retained; other alarm actions were removed.",
+  "开始与结束必须同时为全天日期或具体时间": "Start and end must both be all-day dates or both be timestamps.",
+  "日程或重复例外的结束时间早于开始时间": "The event or recurring exception ends before it starts.",
+  "日程无法解析": "Could not parse this event.",
+  "结束时间早于开始时间": "End time precedes start time.",
+  "重复规则 UNTIL 需要 UTC 时间，请重新导出": "The recurrence UNTIL must use UTC. Export the event again.",
+  "日程格式不合法": "Invalid event format.",
+  "日历连接已改变，请重新预览": "The calendar connection changed. Preview again.",
+  "请先核对预览，再确认导入": "Review the preview before confirming import.",
+  "预览已过期或插件已重启，请重新预览": "The preview expired or the plugin restarted. Preview again.",
+  "每次请选择 1–20 个日程系列，其余可分批导入": "Select 1–20 event series per batch.",
+  "选择包含不可导入的日程，请重新预览": "Some selected events cannot be imported. Preview again.",
+  "另一批日程正在导入，请稍后重试": "Another batch is importing. Try again after it finishes.",
+  "不支持此导入操作": "Unsupported import operation.",
+  "请求必须是对象": "The request must be an object."
+};
+function backendMessage(error) {
+  const message = typeof error === 'string' ? error : error?.message || String(error || '');
+  if (UI_LANG !== 'en') return message;
+  if (error?.status === 401) return 'Your DSH session expired. Reopen DSH and try again.';
+  if (BACKEND_EN[message]) return BACKEND_EN[message];
+  if (!/[\u3400-\u9fff]/.test(message)) return message;
+  const timezone = message.match(/^(文件重复定义时区|时区定义不完整|时区规则的 DTSTART 必须是本地时间|时区偏移不合法|缺少时区定义)：(.+)$/);
+  if (timezone) return ({ '文件重复定义时区': 'Duplicate timezone definition', '时区定义不完整': 'Incomplete timezone definition', '时区规则的 DTSTART 必须是本地时间': 'Timezone DTSTART must use local time', '时区偏移不合法': 'Invalid timezone offset', '缺少时区定义': 'Missing timezone definition' })[timezone[1]] + ': ' + timezone[2];
+  const floating = message.match(/^原文件未标注时区，按 (.+) 解释$/);
+  if (floating) return 'No timezone in the source; interpreted as ' + floating[1] + '.';
+  if (/OAuth|Google|凭据|未配置|尚未配置|没有配置|连接设置/.test(message)) return 'Calendar credentials are incomplete. Open Connection settings and configure the calendar account; the DSH model API key cannot be used here.';
+  if (/时区/.test(message)) return 'Invalid or missing timezone. Choose an interpretation timezone or export a file with VTIMEZONE.';
+  if (/VCALENDAR|VERSION|VEVENT/.test(message)) return 'Use a valid iCalendar 2.0 file containing VEVENT entries.';
+  if (/UID|重复/.test(message)) return 'Check event UIDs and recurrence definitions, then export the file again.';
+  if (/冲突|修改|改变/.test(message)) return 'The calendar or event changed. Reload it and review your input before retrying.';
+  return 'The calendar operation failed. Check the connection and source file, then try again.';
+}
+
+const languageListeners = new Set();
+function useUILanguage() {
+  const [, render] = useState(UI_LANG);
+  useEffect(() => { const update = () => render(UI_LANG); languageListeners.add(update); update(); return () => languageListeners.delete(update); }, []);
+}
 
 /** 宿主 locale 服务：get('locale') 是正规读法，ctx.locale 兜旧宿主，都没有就是没有。 */
 function localeServiceOf(ctx) {
@@ -354,6 +410,7 @@ function localeToLang(active) {
 /** 订阅语言切换；服务缺失或形状不同都只是留在 zh，绝不把面板拖垮。 */
 function subscribeLocale(ctx) {
   const service = localeServiceOf(ctx);
+  activeLocaleService = service;
   if (service === null) return () => {};
   const apply = () => {
     try {
@@ -399,6 +456,7 @@ async function api(action, payload) {
     const error = new Error(message);
     error.status = res.status;
     error.code = body && body.error ? body.error.code : undefined;
+    error.message = backendMessage(error);
     throw error;
   }
   return body.value;
@@ -425,11 +483,13 @@ function daysBetween(a, b) { return Math.round((startOfDay(b) - startOfDay(a)) /
 
 function formatDay(date, opts) {
   const withYear = opts && opts.withYear;
+  if (UI_LANG === "en") return date.toLocaleDateString("en-GB", { year: "numeric", month: "short", day: "numeric" });
   return date.getFullYear() + " 年 " + (date.getMonth() + 1) + " 月 " + date.getDate() + " 日" + (withYear ? "" : "");
 }
-function formatMonthTitle(date) { return date.getFullYear() + " 年 " + (date.getMonth() + 1) + " 月"; }
+function formatMonthTitle(date) { return UI_LANG === "en" ? date.toLocaleDateString("en-GB", { year: "numeric", month: "long" }) : date.getFullYear() + " 年 " + (date.getMonth() + 1) + " 月"; }
 function formatWeekTitle(date) {
   const from = startOfWeek(date), to = addDays(from, 6);
+  if (UI_LANG === "en") return formatDay(from) + " – " + formatDay(to);
   return formatMonthTitle(from) + " " + from.getDate() + "–" + (to.getMonth() === from.getMonth() ? "" : (to.getMonth() + 1) + " 月 ") + to.getDate() + " 日";
 }
 function relativeDay(date) {
@@ -437,7 +497,7 @@ function relativeDay(date) {
   if (diff === 0) return t("day.today");
   if (diff === 1) return t("day.tomorrow");
   if (diff === -1) return t("day.yesterday");
-  return "周" + WEEKDAYS_ZH[isoWeekday(date) - 1];
+  return UI_LANG === "en" ? date.toLocaleDateString("en-GB", { weekday: "short" }) : "周" + WEEKDAYS_ZH[isoWeekday(date) - 1];
 }
 function formatWhen(event) {
   if (event.allDay) return t("format.allday") + " · " + formatDay(startDate(event));
@@ -448,7 +508,7 @@ function formatWhen(event) {
 function formatDuration(event) {
   if (event.allDay) {
     const days = Math.max(1, daysBetween(startDate(event), endDate(event)));
-    return days === 1 ? t("format.allday") : days + " 天";
+    return days === 1 ? t("format.allday") : days + (UI_LANG === "en" ? " days" : " 天");
   }
   const minutes = Math.max(0, Math.round((endDate(event) - startDate(event)) / 60000));
   const hours = Math.floor(minutes / 60), rest = minutes % 60;
@@ -467,6 +527,18 @@ function humanRepeat(rrule) {
     if (i > 0) parts[piece.slice(0, i).toUpperCase()] = piece.slice(i + 1);
   });
   const freq = parts.FREQ;
+  if (UI_LANG === "en") {
+    const units = { DAILY: ["Daily", "days"], WEEKLY: ["Weekly", "weeks"], MONTHLY: ["Monthly", "months"], YEARLY: ["Yearly", "years"] };
+    if (!units[freq]) return rrule;
+    const interval = Number(parts.INTERVAL || "1");
+    const every = interval > 1 ? "Every " + interval + " " + units[freq][1] : units[freq][0];
+    if (parts.COUNT) return every + " (" + parts.COUNT + " occurrences)";
+    if (parts.UNTIL) {
+      const raw = String(parts.UNTIL), date = raw.length >= 8 ? raw.slice(0, 4) + "-" + raw.slice(4, 6) + "-" + raw.slice(6, 8) : raw;
+      return every + ", until " + date;
+    }
+    return every;
+  }
   const base = freq === "DAILY" ? "每天" : freq === "WEEKLY" ? "每周" : freq === "MONTHLY" ? "每月" : freq === "YEARLY" ? "每年" : "";
   if (base === "") return rrule;
   const interval = Number(parts.INTERVAL || "1");
@@ -754,7 +826,7 @@ function MonthView(props) {
     ]));
   }
   return h("div", null, [
-    h("div", { className: "dshc-grid", style: { marginBottom: "4px" } }, WEEKDAYS_ZH.map((d) => h("div", { className: "dshc-dow", key: d }, "周" + d))),
+    h("div", { className: "dshc-grid", style: { marginBottom: "4px" } }, WEEKDAYS_ZH.map((d, i) => h("div", { className: "dshc-dow", key: d }, UI_LANG === "en" ? ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][i] : "周" + d))),
     h("div", { className: "dshc-grid" }, cells)
   ]);
 }
@@ -1438,7 +1510,7 @@ function ConnectionForm(props) {
       const sample = (value.sample || []).join("、");
       setResult({ ok: true, text: t("conn.ok", { n: value.count }) + (sample === "" ? "" : t("conn.okSample", { sample })) });
     } catch (error) {
-      setResult({ ok: false, text: error && error.message ? error.message : String(error) });
+      setResult({ ok: false, text: backendMessage(error) });
     } finally {
       setBusy("");
     }
@@ -1449,7 +1521,7 @@ function ConnectionForm(props) {
     try {
       onSaved(await api("saveConnection", Object.assign({}, payload(), { test: true })));
     } catch (error) {
-      setResult({ ok: false, text: error && error.message ? error.message : String(error) });
+      setResult({ ok: false, text: backendMessage(error) });
     } finally {
       setBusy("");
     }
@@ -1614,7 +1686,7 @@ Object.assign(UI.en, {
 async function importApi(action, payload, signal) {
   const res = await fetch(IMPORT_ROUTE, { method: "POST", credentials: "same-origin", headers: { "Content-Type": "application/json", "X-DSH-Calendar-Import": "1" }, body: JSON.stringify(Object.assign({ action }, payload)), signal });
   let body; try { body = await res.json(); } catch (e) { body = null; }
-  if (!res.ok || !body || body.ok !== true) throw new Error(body && body.message || "HTTP " + res.status);
+  if (!res.ok || !body || body.ok !== true) throw Object.assign(new Error(backendMessage({ message: body && body.message || "HTTP " + res.status, status: res.status })), { status: res.status });
   return body.value;
 }
 function importDate(row) {
@@ -1642,7 +1714,7 @@ function IcsImportPanel(props) {
     const file = event.target.files && event.target.files[0]; if (!file) return;
     const sequence = ++fileSequence.current; reset(); setContent("");
     if (file.size > 256 * 1024) { setError(t("import.errorSize")); return; }
-    try { const value = await file.text(); if (alive.current && sequence === fileSequence.current) setContent(value); } catch (e) { if (alive.current && sequence === fileSequence.current) setError(String(e.message || e)); }
+    try { const value = await file.text(); if (alive.current && sequence === fileSequence.current) setContent(value); } catch (e) { if (alive.current && sequence === fileSequence.current) setError(backendMessage(e)); }
   };
   const eligible = preview ? preview.rows.filter(row => row.status === "ready" && !["imported", "duplicate"].includes(results[row.id] && results[row.id].status)) : [];
   const run = async committing => {
@@ -1655,7 +1727,7 @@ function IcsImportPanel(props) {
         const next = Object.assign({}, results); value.results.forEach(row => { next[row.id] = row; }); setResults(next);
         setSelected(value.results.filter(row => row.status === "failed").map(row => row.id)); props.onImported();
       } else { setPreview(value); setResults({}); setSelected([]); }
-    } catch (e) { if (alive.current) setError(abort.signal.aborted ? t("import.stopped") : String(e.message || e)); }
+    } catch (e) { if (alive.current) setError(abort.signal.aborted ? t("import.stopped") : backendMessage(e)); }
     finally { clearTimeout(timer); controller.current = null; if (alive.current) setBusy(false); }
   };
   const count = Object.values(results);
@@ -1668,7 +1740,7 @@ function IcsImportPanel(props) {
     h("div", { key: "actions", className: "dshc-import-actions" }, [h(Btn, { key: "preview", disabled: busy || !content.trim(), onClick: () => run(false) }, busy ? t("import.busy") : t("import.preview")), h(Btn, { key: "close", disabled: busy, onClick: props.onClose }, t("import.close")), busy ? h(Btn, { key: "stop", onClick: () => controller.current && controller.current.abort() }, t("import.stop")) : null]),
     error ? h("div", { key: "error", className: "dshc-alert error", role: "alert" }, error) : null,
     preview ? h("div", { key: "preview-data" }, [
-      preview.connectionReady === false ? h("div", { key: "connection", className: "dshc-alert warn" }, [preview.connectionMessage, h(Btn, { onClick: props.onConnection }, t("import.connection"))]) : null,
+      preview.connectionReady === false ? h("div", { key: "connection", className: "dshc-alert warn" }, [backendMessage(preview.connectionMessage), h(Btn, { onClick: props.onConnection }, t("import.connection"))]) : null,
       h("p", { key: "scope", className: "dshc-sub" }, t("import.scope")),
       preview.ignored ? h("p", { key: "ignored" }, t("import.ignored", { n: preview.ignored })) : null,
       h("div", { key: "rows", className: "dshc-import-rows" }, preview.rows.map(row => {
@@ -1678,8 +1750,8 @@ function IcsImportPanel(props) {
           h("span", { key: "status", className: "dshc-tag" }, t("import." + status)), h("p", { key: "date" }, importDate(row)),
           row.recurring ? h("p", { key: "repeat" }, t("import.recurring", { n: row.exceptions })) : null,
           status !== "duplicate" && status !== "imported" && row.conflicts ? h("p", { key: "conflict", className: "dshc-import-warning" }, t("import.conflicts", { n: row.conflicts })) : null,
-          ...(status === "duplicate" || status === "imported" ? [] : row.warnings.concat(row.errors)).map((message, i) => h("p", { key: "message-" + i, className: "dshc-import-warning" }, message)),
-          result && result.message ? h("p", { key: "failure", role: "alert" }, result.message) : null
+          ...(status === "duplicate" || status === "imported" ? [] : row.warnings.concat(row.errors)).map((message, i) => h("p", { key: "message-" + i, className: "dshc-import-warning" }, backendMessage(message))),
+          result && result.message ? h("p", { key: "failure", role: "alert" }, backendMessage(result.message)) : null
         ]);
       })),
       count.length ? h("p", { key: "results", role: "status", "aria-live": "polite" }, t("import.results", { ok: count.filter(r => r.status === "imported").length, duplicate: count.filter(r => r.status === "duplicate").length, failed: count.filter(r => r.status === "failed").length })) : null,
@@ -1691,6 +1763,7 @@ function IcsImportPanel(props) {
 }
 
 function CalendarPanel(props) {
+  useUILanguage();
   const compact = props.compact === true;
   const [view, setView] = useState(loadStoredView);
   const [anchor, setAnchor] = useState(() => new Date());
@@ -1910,7 +1983,7 @@ function CalendarPanel(props) {
       reload();
       notify(form.uid === undefined ? "已创建" : "已保存");
     } catch (error) {
-      setFormError(error && error.message ? error.message : String(error));
+      setFormError(backendMessage(error));
     } finally {
       setBusy(false);
     }
@@ -1926,7 +1999,7 @@ function CalendarPanel(props) {
       reload();
       notify("已删除");
     } catch (error) {
-      setBanner(error && error.message ? error.message : String(error));
+      setBanner(backendMessage(error));
     } finally {
       setBusy(false);
     }
@@ -1989,7 +2062,7 @@ function CalendarPanel(props) {
       demo === true ? h("div", { className: "dshc-alert demo" }, t("demo.banner")) : null,
       data.error !== null && data.error !== undefined && demo === false && configured !== false
         ? h("div", { className: "dshc-alert error" }, [
-            h("span", null, (data.error.message || t("error.load"))),
+            h("span", null, backendMessage(data.error) || t("error.load")),
             h("span", { className: "dshc-spacer" }),
             h(Btn, { onClick: reload }, t("action.retry"))
           ])
@@ -2044,6 +2117,7 @@ function addMonthShift(date, delta) {
 
 /** 设置页里的那一节。 */
 function CalendarSection() {
+  useUILanguage();
   return h("div", null, [
     h("h2", null, t("section.title")),
     h("p", { className: "dshc-sub" }, t("section.intro")),
@@ -2053,6 +2127,7 @@ function CalendarSection() {
 
 /** 对话页右下角的小按钮 + 悬浮面板（自己挂 root，不占用宿主槽位）。 */
 function Launcher() {
+  useUILanguage();
   const [open, setOpen] = useState(false);
   const [layerOpen, setLayerOpen] = useState(false);
   useEffect(() => {
@@ -2109,7 +2184,11 @@ function apply(ctx) {
       name: "settings.section",
       id: "dsh-calendar",
       order: 50,
-      label: () => t("nav.title"),
+      label: () => {
+        let lang = UI_LANG;
+        try { if (activeLocaleService?.getSnapshot) lang = localeToLang(activeLocaleService.getSnapshot().active); } catch {}
+        return UI[lang]["nav.title"];
+      },
       inject: () => ({})
     }, CalendarSection));
   } catch (e) { /* 没有 slots 服务：仍是合法的插件，只是没有设置页 */ }
@@ -2142,7 +2221,7 @@ function mountLauncher() {
   };
 }
 
-relocalize = () => { /* 面板是 React 树，语言切换由 subscribeLocale 触发的重渲染覆盖 */ };
+relocalize = () => { for (const update of languageListeners) update(); };
 
 exports.apply = apply;
 exports.inject = inject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-calendar",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "连接 CalDAV 日历，在 DSH 中查看、创建和调整日程。",
   "type": "module",
   "main": "lib/index.js",