Merge pull request #238 from import-ai/patch/del2ndconfirm

chore(del2ndconfirm): Patch i18n

Author: LucienShui

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ on:
       - 'main'
 
 concurrency:
-  group: registry-push-${{ github.ref }}
+  group: registry-push
   cancel-in-progress: true
 
 jobs:

src/components/confirm-delete-dialog/index.tsx

@@ -17,11 +17,10 @@ import { http } from '@/lib/request';
 
 interface IProps {
   open: boolean;
-  title: string;
   titleKey?: string;
-  resourceName?: string;
-  description: string;
-  itemTitle?: string;
+  descriptionKey?: string;
+  targetName: string;
+  itemTitle: string;
   deleteUrl: string;
   restoreUrl?: string;
   successMessage?: string;
@@ -35,10 +34,9 @@ interface IProps {
 export default function ConfirmDeleteDialog(props: IProps) {
   const {
     open,
-    title,
     titleKey,
-    resourceName,
-    description,
+    targetName,
+    descriptionKey,
     itemTitle,
     deleteUrl,
     restoreUrl,
@@ -103,27 +101,19 @@ export default function ConfirmDeleteDialog(props: IProps) {
       <AlertDialogContent>
         <AlertDialogHeader>
           <AlertDialogTitle>
-            {titleKey && itemTitle && resourceName ? (
-              <Trans
-                i18nKey={titleKey}
-                values={{ title: itemTitle, resource_name: resourceName }}
-              />
-            ) : (
-              title
-            )}
+            <Trans
+              i18nKey={titleKey || 'common.dialog.delete.title'}
+              values={{ target_name: targetName }}
+            />
           </AlertDialogTitle>
           <AlertDialogDescription>
-            {itemTitle ? (
-              <Trans
-                i18nKey={description}
-                values={{ title: itemTitle }}
-                components={{
-                  strong: <strong className="font-bold" />,
-                }}
-              />
-            ) : (
-              description
-            )}
+            <Trans
+              i18nKey={descriptionKey || 'common.dialog.delete.description'}
+              values={{ title: itemTitle }}
+              components={{
+                strong: <strong className="font-bold" />,
+              }}
+            />
           </AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter>

src/i18n/locales/en.json

@@ -30,12 +30,6 @@
     "deleted_description": "This resource has been deleted",
     "no_content": "Resource has no content to download",
     "untitled": "Untitled",
-    "delete": {
-      "dialog": {
-        "title": "Delete {{ resource_name }} {{ title }}?",
-        "description": "You are going to delete <strong>{{ title }}</strong>"
-      }
-    },
     "attrs": {
       "tag": "Tag",
       "add_tag": "Add tag",
@@ -387,11 +381,7 @@
       "deleted": "Deleted Conversations",
       "deleted_description": "This conversation has been deleted",
       "delete": {
-        "option": "Delete",
-        "dialog": {
-          "title": "Delete {{ resource_name }} {{ title }}?",
-          "description": "You are going to delete <strong>{{ title }}</strong>"
-        }
+        "option": "Delete"
       },
       "rename": {
         "option": "Rename",
@@ -544,7 +534,13 @@
     "refresh": "Refresh",
     "retry": "Retry",
     "previous": "Previous",
-    "next": "Next"
+    "next": "Next",
+    "dialog": {
+      "delete": {
+        "title": "Delete {{target_name}}？",
+        "description": "You are going to delete <strong>{{title}}</strong>"
+      }
+    }
   },
   "loading": "Loading...",
   "creating": "Creating...",

src/i18n/locales/zh.json

@@ -22,20 +22,14 @@
     "invalid_ext": "当前文件格式不支持"
   },
   "resource": {
-    "name": "资源",
+    "name": "文件",
     "folder": {
       "children_count": "{{ count }} 个文件"
     },
     "deleted": "已删除",
     "deleted_description": "此资源已被删除",
     "no_content": "资源没有内容可下载",
     "untitled": "未命名",
-    "delete": {
-      "dialog": {
-        "title": "删除{{ resource_name }}{{ title }}？",
-        "description": "您将要删除 <strong>{{ title }}</strong>"
-      }
-    },
     "attrs": {
       "tag": "标签",
       "add_tag": "点击添加标签",
@@ -387,11 +381,7 @@
       "deleted": "已删除对话",
       "deleted_description": "此对话已被删除",
       "delete": {
-        "option": "删除对话",
-        "dialog": {
-          "title": "删除{{ resource_name }}{{ title }}？",
-          "description": "您将要删除 <strong>{{ title }}</strong>。"
-        }
+        "option": "删除对话"
       },
       "rename": {
         "option": "重命名",
@@ -544,7 +534,13 @@
     "refresh": "刷新",
     "retry": "重试",
     "previous": "上一页",
-    "next": "下一页"
+    "next": "下一页",
+    "dialog": {
+      "delete": {
+        "title": "删除{{target_name}}？",
+        "description": "您将要删除 <strong>{{title}}</strong>"
+      }
+    }
   },
   "loading": "加载中...",
   "creating": "创建中...",

src/page/chat/conversations/remove.tsx

@@ -20,10 +20,7 @@ export default function RemoveHistory(props: IProps) {
   return (
     <ConfirmDeleteDialog
       open={data.open}
-      title={t('chat.conversations.delete.dialog.title')}
-      titleKey="chat.conversations.delete.dialog.title"
-      resourceName={t('chat.conversations.name')}
-      description="chat.conversations.delete.dialog.description"
+      targetName={t('chat.conversations.name')}
       itemTitle={data.title}
       deleteUrl={`namespaces/${namespaceId}/conversations/${data.id}`}
       restoreUrl={`/namespaces/${namespaceId}/conversations/${data.id}/restore`}

src/page/chat/header/actions.tsx

@@ -164,10 +164,7 @@ export default function Actions(props: IProps) {
       )}
       <ConfirmDeleteDialog
         open={remove}
-        title={t('chat.conversations.delete.dialog.title')}
-        titleKey="chat.conversations.delete.dialog.title"
-        resourceName={t('chat.conversations.name')}
-        description="chat.conversations.delete.dialog.description"
+        targetName={t('chat.conversations.name')}
         itemTitle={chatTitle}
         deleteUrl={`/namespaces/${namespaceId}/conversations/${conversationId}`}
         restoreUrl={`/namespaces/${namespaceId}/conversations/${conversationId}/restore`}

src/page/resource/actions/index.tsx

@@ -550,10 +550,7 @@ export default function Actions(props: IActionProps) {
       {resource && (
         <ConfirmDeleteDialog
           open={showDeleteDialog}
-          title={t('resource.delete.dialog.title')}
-          titleKey="resource.delete.dialog.title"
-          resourceName={t('resource.name')}
-          description="resource.delete.dialog.description"
+          targetName={t('resource.name')}
           itemTitle={resource.name || t('resource.untitled')}
           deleteUrl={`/namespaces/${namespaceId}/resources/${resource.id}`}
           restoreUrl={`/namespaces/${namespaceId}/resources/${resource.id}/restore`}

src/page/sidebar/index.tsx

@@ -61,10 +61,7 @@ export default function MainSidebar() {
       <Setting />
       <ConfirmDeleteDialog
         open={deleteDialog.open}
-        title={t('resource.delete.dialog.title')}
-        titleKey="resource.delete.dialog.title"
-        resourceName={t('resource.name')}
-        description="resource.delete.dialog.description"
+        targetName={t('resource.name')}
         itemTitle={deleteDialog.title}
         deleteUrl={`/namespaces/${namespaceId}/resources/${deleteDialog.id}`}
         restoreUrl={`/namespaces/${namespaceId}/resources/${deleteDialog.id}/restore`}