From 01a9c7cde6c32c33eaaa5f05dc8eba6288e752ed Mon Sep 17 00:00:00 2001 From: yiling Date: Mon, 6 Jul 2026 10:52:55 +0800 Subject: [PATCH] refactor(i18n): address code review feedback on string legos, hardcoded locales, and fragile checks --- .../webui/components/chat/message-card.tsx | 4 +- .../webui/components/chat/message-input.tsx | 2 +- .../components/file-browser/file-card.tsx | 7 +- .../webui/components/file-browser/toolbar.tsx | 1 + packages/webui/components/members-dialog.tsx | 7 +- .../webui/components/notification-card.tsx | 121 ++++++++---------- packages/webui/components/upload-tasks.tsx | 3 +- packages/webui/messages/en.json | 6 +- packages/webui/messages/zh.json | 6 +- packages/webui/paraglide/messages/_index.d.ts | 4 + packages/webui/paraglide/messages/_index.js | 6 +- .../paraglide/messages/created_by_at.d.ts | 19 +++ .../webui/paraglide/messages/created_by_at.js | 29 +++++ .../paraglide/messages/date_format_long.d.ts | 16 +++ .../paraglide/messages/date_format_long.js | 29 +++++ .../paraglide/messages/reply_to_message.d.ts | 18 +++ .../paraglide/messages/reply_to_message.js | 29 +++++ .../messages/tool_result_with_name.d.ts | 18 +++ .../messages/tool_result_with_name.js | 29 +++++ packages/webui/routes/teams/$teamId/index.tsx | 1 + 20 files changed, 274 insertions(+), 81 deletions(-) create mode 100644 packages/webui/paraglide/messages/created_by_at.d.ts create mode 100644 packages/webui/paraglide/messages/created_by_at.js create mode 100644 packages/webui/paraglide/messages/date_format_long.d.ts create mode 100644 packages/webui/paraglide/messages/date_format_long.js create mode 100644 packages/webui/paraglide/messages/reply_to_message.d.ts create mode 100644 packages/webui/paraglide/messages/reply_to_message.js create mode 100644 packages/webui/paraglide/messages/tool_result_with_name.d.ts create mode 100644 packages/webui/paraglide/messages/tool_result_with_name.js diff --git a/packages/webui/components/chat/message-card.tsx b/packages/webui/components/chat/message-card.tsx index e365afc9..70665768 100644 --- a/packages/webui/components/chat/message-card.tsx +++ b/packages/webui/components/chat/message-card.tsx @@ -345,7 +345,9 @@ export const MessageCard: React.FC = ({ badgeColor = msg.isError ? 'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-300' : 'bg-emerald-100 text-emerald-800 dark:bg-emerald-900/30 dark:text-emerald-300' - roleName = `${m.tool_result()} ${String(msg.toolName || m.unknown())}` + roleName = m.tool_result_with_name({ + name: String(msg.toolName || m.unknown()), + }) } else if (msg.role === 'thought') { badgeColor = 'bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300' diff --git a/packages/webui/components/chat/message-input.tsx b/packages/webui/components/chat/message-input.tsx index 6a14033d..4435d381 100644 --- a/packages/webui/components/chat/message-input.tsx +++ b/packages/webui/components/chat/message-input.tsx @@ -604,7 +604,7 @@ export const ChatInput = React.forwardRef( {replyingTo && (
- {m.reply_to()} {replyingTo.message} + {m.reply_to_message({ message: replyingTo.message || '' })}
diff --git a/packages/webui/components/file-browser/toolbar.tsx b/packages/webui/components/file-browser/toolbar.tsx index 83660ea1..4a524621 100644 --- a/packages/webui/components/file-browser/toolbar.tsx +++ b/packages/webui/components/file-browser/toolbar.tsx @@ -383,6 +383,7 @@ export function FileBrowserToolbar({ open={isMembersDialogOpen} onOpenChange={handleOpenMembersDialog} title={m.project_members()} + type="project" members={members || []} isOwner={me?.role === 'owner'} onInvite={handleInvite} diff --git a/packages/webui/components/members-dialog.tsx b/packages/webui/components/members-dialog.tsx index c9bde963..f65e3776 100644 --- a/packages/webui/components/members-dialog.tsx +++ b/packages/webui/components/members-dialog.tsx @@ -44,6 +44,7 @@ interface MembersDialogProps { currentUserId?: string availableMembersToAdd?: Member[] onAddMember?: (userId: string, role: 'editor' | 'reviewer') => Promise + type?: 'project' | 'team' } export function MembersDialog({ @@ -58,6 +59,7 @@ export function MembersDialog({ currentUserId, availableMembersToAdd, onAddMember, + type = 'team', }: MembersDialogProps) { const [inviteRole, setInviteRole] = useState<'editor' | 'reviewer'>('editor') const [inviteLink, setInviteLink] = useState(null) @@ -256,10 +258,7 @@ export function MembersDialog({ {m.remove_member_confirmation({ name: memberToRemove?.name || '', - type: - title.toLowerCase().includes('project') || title.includes('项目') - ? m.project() - : m.team(), + type: type === 'project' ? m.project() : m.team(), })} diff --git a/packages/webui/components/notification-card.tsx b/packages/webui/components/notification-card.tsx index a80b9e88..b17f0405 100644 --- a/packages/webui/components/notification-card.tsx +++ b/packages/webui/components/notification-card.tsx @@ -3,12 +3,35 @@ import { formatTimeAgo } from '@/ui/lib/time' import { cn } from '@/ui/lib/utils' import { SpriteScrubber } from './sprite-scrubber' import { m } from '@/ui/paraglide/messages.js' -import { getLocale } from '@/ui/paraglide/runtime.js' +import React from 'react' interface NotificationCardProps { notification: NotificationInfo } +const renderNotification = ( + messageTemplate: string, + placeholders: Record, +) => { + const regex = new RegExp( + `(${Object.keys(placeholders) + .map((k) => `\\{${k}\\}`) + .join('|')})`, + 'g', + ) + return ( + + {messageTemplate.split(regex).map((part, index) => { + const match = part.match(/^\{(.+)\}$/) + if (match && placeholders[match[1]]) { + return {placeholders[match[1]]} + } + return part + })} + + ) +} + export const NotificationCard = ({ notification }: NotificationCardProps) => { const { creator, createdAt, isRead, type, asset, project, team, user } = notification @@ -19,90 +42,52 @@ export const NotificationCard = ({ notification }: NotificationCardProps) => { const teamName = team?.name || m.unknown_team() const targetUserName = user?.name || m.unknown_user() - const isZh = getLocale() === 'zh' - const creatorEl = {creatorName} - const assetEl = {assetName} - const projectEl = {projectName} - const teamEl = {teamName} - const userEl = {targetUserName} + const placeholders = { + creator: {creatorName}, + asset: {assetName}, + project: {projectName}, + team: {teamName}, + user: {targetUserName}, + } switch (type) { case 'comment_created': - return isZh ? ( - - {creatorEl} 评论了 {assetEl} - - ) : ( - - {creatorEl} commented on {assetEl} - + return renderNotification( + m.notification_commented_on({ creator: '{creator}', asset: '{asset}' }), + placeholders, ) case 'reply_created': - return isZh ? ( - - {creatorEl} 回复了 {assetEl} 上的评论 - - ) : ( - - {creatorEl} replied to a comment on {assetEl} - + return renderNotification( + m.notification_replied_to({ creator: '{creator}', asset: '{asset}' }), + placeholders, ) case 'mention': - return isZh ? ( - - {creatorEl} 在 {assetEl} 中提及了你 - - ) : ( - - {creatorEl} mentioned you in {assetEl} - + return renderNotification( + m.notification_mentioned_you({ creator: '{creator}', asset: '{asset}' }), + placeholders, ) case 'successful_file_uploaded': - return isZh ? ( - - {creatorEl} 将 {assetEl} 上传到 {projectEl} - - ) : ( - - {creatorEl} uploaded {assetEl} to {projectEl} - + return renderNotification( + m.notification_uploaded({ creator: '{creator}', asset: '{asset}', project: '{project}' }), + placeholders, ) case 'metadata_field_updated_status': - return isZh ? ( - - {creatorEl} 更新了 {assetEl} 的状态 - - ) : ( - - {creatorEl} updated status of {assetEl} - + return renderNotification( + m.notification_status_updated({ creator: '{creator}', asset: '{asset}' }), + placeholders, ) case 'new_user_join_team': - return isZh ? ( - - {userEl} 加入了 {teamEl} - - ) : ( - - {userEl} joined {teamEl} - + return renderNotification( + m.notification_joined_team({ user: '{user}', team: '{team}' }), + placeholders, ) case 'new_user_join_project': - return isZh ? ( - - {userEl} 加入了 {projectEl} - - ) : ( - - {userEl} joined {projectEl} - + return renderNotification( + m.notification_joined_project({ user: '{user}', project: '{project}' }), + placeholders, ) default: - return isZh ? ( - 来自 {creatorEl} 的新通知 - ) : ( - New notification from {creatorEl} - ) + return renderNotification(m.notification_generic({ creator: '{creator}' }), placeholders) } })() diff --git a/packages/webui/components/upload-tasks.tsx b/packages/webui/components/upload-tasks.tsx index 4e8b35fd..976c2cc6 100644 --- a/packages/webui/components/upload-tasks.tsx +++ b/packages/webui/components/upload-tasks.tsx @@ -10,7 +10,6 @@ import { format, parseISO, isToday, isYesterday } from 'date-fns' import { Progress } from '@/ui/components/ui/progress' import { formatTimeAgo } from '@/ui/lib/time' import { m } from '@/ui/paraglide/messages.js' -import { getLocale } from '@/ui/paraglide/runtime.js' function formatDayHeader(dateString: string): string { const date = parseISO(dateString) @@ -23,7 +22,7 @@ function formatDayHeader(dateString: string): string { if (isYesterday(date)) { return m.yesterday() } - return format(date, getLocale() === 'zh' ? 'yyyy年M月d日' : 'MMMM d, yyyy') + return format(date, m.date_format_long()) } function formatBytes(bytes: number): string { diff --git a/packages/webui/messages/en.json b/packages/webui/messages/en.json index 402e1e2a..eadc33b5 100644 --- a/packages/webui/messages/en.json +++ b/packages/webui/messages/en.json @@ -813,5 +813,9 @@ "yesterday_with_time": "Yesterday {time}", "n_items_singular": "{count} Item", "n_items_plural": "{count} Items", - "fullscreen": "Fullscreen" + "fullscreen": "Fullscreen", + "created_by_at": "{time} by {author}", + "date_format_long": "MMMM d, yyyy", + "tool_result_with_name": "Tool Result: {name}", + "reply_to_message": "reply to: {message}" } diff --git a/packages/webui/messages/zh.json b/packages/webui/messages/zh.json index 3b4d1ac0..d6dfc018 100644 --- a/packages/webui/messages/zh.json +++ b/packages/webui/messages/zh.json @@ -813,5 +813,9 @@ "yesterday_with_time": "昨天 {time}", "n_items_singular": "{count} 个项目", "n_items_plural": "{count} 个项目", - "fullscreen": "全屏" + "fullscreen": "全屏", + "created_by_at": "{time} 由 {author} 创建", + "date_format_long": "yyyy年M月d日", + "tool_result_with_name": "工具结果:{name}", + "reply_to_message": "回复:{message}" } diff --git a/packages/webui/paraglide/messages/_index.d.ts b/packages/webui/paraglide/messages/_index.d.ts index 0cf65b15..405958db 100644 --- a/packages/webui/paraglide/messages/_index.d.ts +++ b/packages/webui/paraglide/messages/_index.d.ts @@ -761,4 +761,8 @@ export * from "./yesterday_with_time.js"; export * from "./n_items_singular.js"; export * from "./n_items_plural.js"; export * from "./fullscreen.js"; +export * from "./created_by_at.js"; +export * from "./date_format_long.js"; +export * from "./tool_result_with_name.js"; +export * from "./reply_to_message.js"; export type LocalizedString = import("../runtime.js").LocalizedString; diff --git a/packages/webui/paraglide/messages/_index.js b/packages/webui/paraglide/messages/_index.js index 738c9f57..c7442588 100644 --- a/packages/webui/paraglide/messages/_index.js +++ b/packages/webui/paraglide/messages/_index.js @@ -762,4 +762,8 @@ export * from './today_with_time.js' export * from './yesterday_with_time.js' export * from './n_items_singular.js' export * from './n_items_plural.js' -export * from './fullscreen.js' \ No newline at end of file +export * from './fullscreen.js' +export * from './created_by_at.js' +export * from './date_format_long.js' +export * from './tool_result_with_name.js' +export * from './reply_to_message.js' \ No newline at end of file diff --git a/packages/webui/paraglide/messages/created_by_at.d.ts b/packages/webui/paraglide/messages/created_by_at.d.ts new file mode 100644 index 00000000..9d7904f8 --- /dev/null +++ b/packages/webui/paraglide/messages/created_by_at.d.ts @@ -0,0 +1,19 @@ +/** +* | output | +* | --- | +* | "{time} by {author}" | +* +* @param {Created_By_AtInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const created_by_at: ((inputs: Created_By_AtInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Created_By_AtInputs = { + time: NonNullable; + author: NonNullable; +}; diff --git a/packages/webui/paraglide/messages/created_by_at.js b/packages/webui/paraglide/messages/created_by_at.js new file mode 100644 index 00000000..bb5460a3 --- /dev/null +++ b/packages/webui/paraglide/messages/created_by_at.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{ time: NonNullable, author: NonNullable }} Created_By_AtInputs */ + +const en_created_by_at = /** @type {(inputs: Created_By_AtInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`${i?.time} by ${i?.author}`) +}; + +const zh_created_by_at = /** @type {(inputs: Created_By_AtInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`${i?.time} 由 ${i?.author} 创建`) +}; + +/** +* | output | +* | --- | +* | "{time} by {author}" | +* +* @param {Created_By_AtInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const created_by_at = /** @type {((inputs: Created_By_AtInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_created_by_at(inputs) + return zh_created_by_at(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/date_format_long.d.ts b/packages/webui/paraglide/messages/date_format_long.d.ts new file mode 100644 index 00000000..3348e6a1 --- /dev/null +++ b/packages/webui/paraglide/messages/date_format_long.d.ts @@ -0,0 +1,16 @@ +/** +* | output | +* | --- | +* | "MMMM d, yyyy" | +* +* @param {Date_Format_LongInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const date_format_long: ((inputs?: Date_Format_LongInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Date_Format_LongInputs = {}; diff --git a/packages/webui/paraglide/messages/date_format_long.js b/packages/webui/paraglide/messages/date_format_long.js new file mode 100644 index 00000000..8861cfc5 --- /dev/null +++ b/packages/webui/paraglide/messages/date_format_long.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{}} Date_Format_LongInputs */ + +const en_date_format_long = /** @type {(inputs: Date_Format_LongInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`MMMM d, yyyy`) +}; + +const zh_date_format_long = /** @type {(inputs: Date_Format_LongInputs) => LocalizedString} */ () => { + return /** @type {LocalizedString} */ (`yyyy年M月d日`) +}; + +/** +* | output | +* | --- | +* | "MMMM d, yyyy" | +* +* @param {Date_Format_LongInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const date_format_long = /** @type {((inputs?: Date_Format_LongInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs = {}, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_date_format_long(inputs) + return zh_date_format_long(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/reply_to_message.d.ts b/packages/webui/paraglide/messages/reply_to_message.d.ts new file mode 100644 index 00000000..c148b5cd --- /dev/null +++ b/packages/webui/paraglide/messages/reply_to_message.d.ts @@ -0,0 +1,18 @@ +/** +* | output | +* | --- | +* | "reply to: {message}" | +* +* @param {Reply_To_MessageInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const reply_to_message: ((inputs: Reply_To_MessageInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Reply_To_MessageInputs = { + message: NonNullable; +}; diff --git a/packages/webui/paraglide/messages/reply_to_message.js b/packages/webui/paraglide/messages/reply_to_message.js new file mode 100644 index 00000000..a19f6aef --- /dev/null +++ b/packages/webui/paraglide/messages/reply_to_message.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{ message: NonNullable }} Reply_To_MessageInputs */ + +const en_reply_to_message = /** @type {(inputs: Reply_To_MessageInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`reply to: ${i?.message}`) +}; + +const zh_reply_to_message = /** @type {(inputs: Reply_To_MessageInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`回复:${i?.message}`) +}; + +/** +* | output | +* | --- | +* | "reply to: {message}" | +* +* @param {Reply_To_MessageInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const reply_to_message = /** @type {((inputs: Reply_To_MessageInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_reply_to_message(inputs) + return zh_reply_to_message(inputs) +}); \ No newline at end of file diff --git a/packages/webui/paraglide/messages/tool_result_with_name.d.ts b/packages/webui/paraglide/messages/tool_result_with_name.d.ts new file mode 100644 index 00000000..3bb5b8ec --- /dev/null +++ b/packages/webui/paraglide/messages/tool_result_with_name.d.ts @@ -0,0 +1,18 @@ +/** +* | output | +* | --- | +* | "Tool Result: {name}" | +* +* @param {Tool_Result_With_NameInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const tool_result_with_name: ((inputs: Tool_Result_With_NameInputs, options?: { + locale?: "en" | "zh"; +}) => LocalizedString) & import("../runtime.js").MessageMetadata; +export type LocalizedString = import("../runtime.js").LocalizedString; +export type Tool_Result_With_NameInputs = { + name: NonNullable; +}; diff --git a/packages/webui/paraglide/messages/tool_result_with_name.js b/packages/webui/paraglide/messages/tool_result_with_name.js new file mode 100644 index 00000000..108342bd --- /dev/null +++ b/packages/webui/paraglide/messages/tool_result_with_name.js @@ -0,0 +1,29 @@ +/* eslint-disable */ +import { getLocale, experimentalStaticLocale } from '../runtime.js'; + +/** @typedef {import('../runtime.js').LocalizedString} LocalizedString */ + +/** @typedef {{ name: NonNullable }} Tool_Result_With_NameInputs */ + +const en_tool_result_with_name = /** @type {(inputs: Tool_Result_With_NameInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`Tool Result: ${i?.name}`) +}; + +const zh_tool_result_with_name = /** @type {(inputs: Tool_Result_With_NameInputs) => LocalizedString} */ (i) => { + return /** @type {LocalizedString} */ (`工具结果:${i?.name}`) +}; + +/** +* | output | +* | --- | +* | "Tool Result: {name}" | +* +* @param {Tool_Result_With_NameInputs} inputs +* @param {{ locale?: "en" | "zh" }} options +* @returns {LocalizedString} +*/ +export const tool_result_with_name = /** @type {((inputs: Tool_Result_With_NameInputs, options?: { locale?: "en" | "zh" }) => LocalizedString) & import('../runtime.js').MessageMetadata} */ ((inputs, options = {}) => { + const locale = experimentalStaticLocale ?? options.locale ?? getLocale() + if (locale === "en") return en_tool_result_with_name(inputs) + return zh_tool_result_with_name(inputs) +}); \ No newline at end of file diff --git a/packages/webui/routes/teams/$teamId/index.tsx b/packages/webui/routes/teams/$teamId/index.tsx index 665a6793..50570d59 100644 --- a/packages/webui/routes/teams/$teamId/index.tsx +++ b/packages/webui/routes/teams/$teamId/index.tsx @@ -476,6 +476,7 @@ function TeamPage() { open={isMembersDialogOpen} onOpenChange={setIsMembersDialogOpen} title={m.team_members()} + type="team" members={safeMembers} isOwner={me?.role === 'owner'} onInvite={handleInvite}