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

feat: add translation for g2g errors

mizozobu 3 лет назад
Родитель
Сommit
abbc23e484

+ 5 - 0
packages/app/public/static/locales/en_US/admin.json

@@ -1041,5 +1041,10 @@
     "once_transfer_key_used": "Once the transfer key is used for transfer, it cannot be used for any other transfer.",
     "transfer_to_growi_cloud": "If you wish to transfer to GROWI.cloud, please click here.",
     "paste_transfer_key": "Paste transter key here"
+  },
+  "g2g": {
+    "error_upload_attachment": "Failed to upload attachment <code>%s</code>",
+    "error_generate_growi_archive": "Failed to generate GROWI archive file",
+    "error_send_growi_archive": "Failed to send GROWI archive file to new GROWI"
   }
 }

+ 5 - 0
packages/app/public/static/locales/ja_JP/admin.json

@@ -1040,5 +1040,10 @@
     "ADMIN_SEARCH_CONNECTION": "Elasticsearch の再接続の試行",
     "ADMIN_SEARCH_INDICES_NORMALIZE": "Elasticsearch のインデックスの正規化",
     "ADMIN_SEARCH_INDICES_REBUILD": "Elasticsearch のインデックスのリビルド"
+  },
+  "g2g": {
+    "error_upload_attachment": "添付ファイルのアップロードに失敗しました",
+    "error_generate_growi_archive": "GROWI アーカイブファイルの作成に失敗しました",
+    "error_send_growi_archive": "GROWI アーカイブファイルの送信に失敗しました"
   }
 }

+ 5 - 0
packages/app/public/static/locales/zh_CN/admin.json

@@ -1006,5 +1006,10 @@
     "ADMIN_SEARCH_CONNECTION": "重试Elasticsearch连接",
     "ADMIN_SEARCH_INDICES_NORMALIZE": "试图重新连接Elasticsearch",
     "ADMIN_SEARCH_INDICES_REBUILD": "重建 Elasticsearch 索引"
+  },
+  "g2g": {
+    "error_upload_attachment": "Failed to upload attachment <code>%s</code>",
+    "error_generate_growi_archive": "Failed to generate GROWI archive file",
+    "error_send_growi_archive": "Failed to send GROWI archive file to new GROWI"
   }
 }

+ 2 - 2
packages/app/src/components/Admin/G2GDataTransfer.tsx

@@ -70,9 +70,9 @@ const G2GDataTransfer = (): JSX.Element => {
         setStatusMessage(t('Successfully transferred GROWI. Now you can use new GROWI !'));
       });
 
-      socket.on('admin:onG2gError', ({ message }) => {
+      socket.on('admin:onG2gError', ({ key }) => {
         setTransferring(false);
-        setStatusMessage(t(message));
+        setStatusMessage(t(key));
       });
     }
   }, [socket, t]);

+ 3 - 4
packages/app/src/server/service/g2g-transfer.ts

@@ -295,7 +295,6 @@ export class G2GTransferPusherService implements Pusher {
         }
         catch (err) {
           logger.error(`Error occured when uploading attachment(ID=${attachment.id})`, err);
-          socket.emit('admin:onG2gError', { message: `Failed to upload attachment ${attachment.id}.` });
         }
       }
     }
@@ -323,7 +322,7 @@ export class G2GTransferPusherService implements Pusher {
     }
     catch (err) {
       logger.error(err);
-      socket.emit('admin:onG2gError', { message: 'Failed to generate Growi archive file.' });
+      socket.emit('admin:onG2gError', { message: 'Failed to generate GROWI archive file', key: 'error_generate_growi_archive' });
       throw err;
     }
 
@@ -342,7 +341,7 @@ export class G2GTransferPusherService implements Pusher {
     }
     catch (err) {
       logger.error(err);
-      socket.emit('admin:onG2gError', { message: 'Failed to send Growi archive file to new Growi.' });
+      socket.emit('admin:onG2gError', { message: 'Failed to send GROWI archive file to new GROWI', key: 'error_send_growi_archive' });
       throw err;
     }
 
@@ -353,7 +352,7 @@ export class G2GTransferPusherService implements Pusher {
     }
     catch (err) {
       logger.error(err);
-      socket.emit('admin:onG2gError', { message: 'Failed to transfer attachments.' });
+      socket.emit('admin:onG2gError', { message: 'Failed to transfer attachments', key: 'error_upload_attachment' });
       throw err;
     }