Просмотр исходного кода

change toast`s sentence and improve decision making

keigo-h 3 лет назад
Родитель
Сommit
3f3fe9f32c

+ 1 - 1
packages/app/resource/locales/en_US/translation.json

@@ -438,7 +438,7 @@
     "recursively": "Delete pages under this path recursively.",
     "completely": "Delete completely instead of putting it into trash."
   },
-  "deleted_page": "Page has been deleted",
+  "deleted_page": "Moved to the trash",
   "deleted_pages": "{{path}} has been deleted",
   "deleted_pages_completely": "{{path}} has been deleted completely",
   "renamed_pages": "{{path}} has been renamed",

+ 1 - 1
packages/app/resource/locales/ja_JP/translation.json

@@ -438,7 +438,7 @@
     "recursively": "配下のページも削除します",
     "completely": "ゴミ箱を経由せず、完全に削除します"
   },
-  "deleted_page": "ページが削除されました",
+  "deleted_page": "ゴミ箱に入れました",
   "deleted_pages": "{{path}} をゴミ箱に入れました",
   "deleted_pages_completely": "{{path}} を完全に削除しました",
   "renamed_pages": "{{path}} を移動/名前変更しました",

+ 1 - 1
packages/app/resource/locales/zh_CN/translation.json

@@ -417,7 +417,7 @@
 		"recursively": "Delete children of <code>%s</code> recursively.",
 		"completely": "Delete completely instead of putting it into trash."
   },
-  "deleted_page": "删去的页面。",
+  "deleted_page": "移到了垃圾箱。",
   "deleted_pages": "将 {{path}} 放入垃圾箱",
   "deleted_pages_completely": "{{path}} 已被完全删除",
   "renamed_pages": "移动/重命名 {{path}}",

+ 3 - 2
packages/app/src/components/DescendantsPageList.tsx

@@ -64,9 +64,10 @@ export const DescendantsPageListSubstance = (props: SubstanceProps): JSX.Element
   const pageDeletedHandler: OnDeletedFunction = useCallback((...args) => {
     if (args[0] == null || args[2] == null) {
       toastSuccess(t('deleted_page'));
-      return;
     }
-    toastSuccess(args[2] ? t('deleted_pages_completely', { path: args[0] }) : t('deleted_pages', { path: args[0] }));
+    else {
+      toastSuccess(args[2] ? t('deleted_pages_completely', { path: args[0] }) : t('deleted_pages', { path: args[0] }));
+    }
 
     advancePt();