Explorar o código

toaster sentence

yuken %!s(int64=4) %!d(string=hai) anos
pai
achega
2b53b250ab

+ 4 - 1
packages/app/resource/locales/en_US/admin/admin.json

@@ -31,7 +31,10 @@
     "already_upgraded": "You have already completed the conversion to v5 compatibility",
     "already_upgraded": "You have already completed the conversion to v5 compatibility",
     "header_upgrading_progress": "Upgrade Progress",
     "header_upgrading_progress": "Upgrade Progress",
     "migration_succeeded": "Your upgrade has been successfully completed! Exit maintenance mode and GROWI can be used.",
     "migration_succeeded": "Your upgrade has been successfully completed! Exit maintenance mode and GROWI can be used.",
-    "migration_failed": "Upgrade failed. Please refer to the GROWI docs for information on what to do in the event of failure."
+    "migration_failed": "Upgrade failed. Please refer to the GROWI docs for information on what to do in the event of failure.",
+    "page_migration_succeeded": "Conversion of page to v5 has been successfully completed.",
+    "page_migration_failed_with_paths": "Conversion of {{paths}} to v5 has been failed.",
+    "page_migration_failed": "Conversion of page to v5 has been failed."
   },
   },
   "maintenance_mode": {
   "maintenance_mode": {
     "maintenance_mode": "Maintenance Mode",
     "maintenance_mode": "Maintenance Mode",

+ 3 - 2
packages/app/resource/locales/ja_JP/admin/admin.json

@@ -32,8 +32,9 @@
     "header_upgrading_progress": "アップグレード進行度",
     "header_upgrading_progress": "アップグレード進行度",
     "migration_succeeded": "アップグレードが正常に完了しました!メンテナンスモードを終了して、GROWI を使用することができます。",
     "migration_succeeded": "アップグレードが正常に完了しました!メンテナンスモードを終了して、GROWI を使用することができます。",
     "migration_failed": "アップグレードが失敗しました。失敗した場合の対処法は GROWI docs を参照してください。",
     "migration_failed": "アップグレードが失敗しました。失敗した場合の対処法は GROWI docs を参照してください。",
-    "page_migration_succeeded": "ページの v5 互換形式変換が正常に終了しました。",
-    "page_migration_failed": "{{paths}} の変換中にエラーが発生しました。"
+    "page_migration_succeeded": "ページの v5 互換形式への変換が正常に終了しました。",
+    "page_migration_failed_with_paths": "{{paths}} の v5 互換形式への変換中にエラーが発生しました。",
+    "page_migration_failed": "ページの v5 互換形式への変換中にエラーが発生しました。"
   },
   },
   "maintenance_mode": {
   "maintenance_mode": {
     "maintenance_mode": "メンテナンスモード",
     "maintenance_mode": "メンテナンスモード",

+ 4 - 1
packages/app/resource/locales/zh_CN/admin/admin.json

@@ -31,7 +31,10 @@
     "already_upgraded": "你已经完成了向v5兼容性的转换",
     "already_upgraded": "你已经完成了向v5兼容性的转换",
     "header_upgrading_progress": "升级进度",
     "header_upgrading_progress": "升级进度",
     "migration_succeeded": "您的升级已经成功完成! 退出维护模式,可以使用GROWI。",
     "migration_succeeded": "您的升级已经成功完成! 退出维护模式,可以使用GROWI。",
-    "migration_failed": "升级失败。请参考GROWI的文档,了解在失败情况下该如何处理。"
+    "migration_failed": "升级失败。请参考GROWI的文档,了解在失败情况下该如何处理。",
+    "page_migration_succeeded": "页面到 v5 兼容格式的转换已成功完成。",
+    "page_migration_failed_with_paths": "将 {{paths}} 转换为 v5 兼容格式时出错",
+    "page_migration_failed": "将页面转换为 v5 兼容格式时出错。"
   },
   },
   "maintenance_mode": {
   "maintenance_mode": {
     "maintenance_mode": "维护模式",
     "maintenance_mode": "维护模式",

+ 7 - 4
packages/app/src/components/PrivateLegacyPages.tsx

@@ -171,14 +171,17 @@ export const PrivateLegacyPages = (props: Props): JSX.Element => {
 
 
   useEffect(() => {
   useEffect(() => {
     socket?.on(SocketEventName.PageMigrationSuccess, () => {
     socket?.on(SocketEventName.PageMigrationSuccess, () => {
-      // page migration success
       toastSuccess(t('admin:v5_page_migration.page_migration_succeeded'));
       toastSuccess(t('admin:v5_page_migration.page_migration_succeeded'));
     });
     });
 
 
     socket?.on(SocketEventName.PageMigrationError, (data: PageMigrationErrorData) => {
     socket?.on(SocketEventName.PageMigrationError, (data: PageMigrationErrorData) => {
-      // page migration error
-      const errorPaths: string = data.paths.join(', ');
-      toastWarning(t('admin:v5_page_migration.page_migration_failed', { paths: errorPaths }));
+      if (data.paths.length === 0) {
+        toastWarning(t('admin:v5_page_migration.page_migration_failed'));
+      }
+      else if (data.paths.length > 3) {
+        const errorPaths = data.paths.length > 3 ? `${data.paths.slice(0, 3).join(', ')}...` : data.paths.join(', ');
+        toastWarning(t('admin:v5_page_migration.page_migration_failed_with_paths', { paths: errorPaths }));
+      }
     });
     });
 
 
     return () => {
     return () => {