Merge pull request #1552 from weseek/imprv/refactor-export-i18n

Imprv/refactor export i18n

resource/locales/en-US/admin/export_management.json

@@ -0,0 +1,18 @@
+{
+  "exporting_collection_list": "Exporting Collection List",
+  "exported_data_list": "Exported Archive Data List",
+  "export_collections": "Export Collections",
+  "check_all": "Check All",
+  "uncheck_all": "Uncheck All",
+  "desc_password_seed": "DO NOT FORGET to set current <code>PASSWORD_SEED</code> to your new GROWI system when restoring user data, or users will NOT be able to login with their password.<br><br><strong>HINT:</strong><br>The current <code>PASSWORD_SEED</code> will be stored in <code>meta.json</code> in exported ZIP.",
+  "create_new_archive_data": "Create New Archive Data",
+  "export": "Export",
+  "cancel": "Cancel",
+  "file": "File",
+  "growi_version": "Growi Version",
+  "collections": "Collections",
+  "exported_at": "Exported At",
+  "export_menu": "Export Menu",
+  "download": "Download",
+  "delete": "Delete"
+}

resource/locales/en-US/translation.json

@@ -602,23 +602,5 @@
     "rebuild_description_1": "Force rebuild index.",
     "rebuild_description_2": "Click 'Build Now' to delete and create mapping file and add all pages.",
     "rebuild_description_3": "This may take a while."
-  },
-  "export_management": {
-    "exporting_collection_list": "Exporting Collection List",
-    "exported_data_list": "Exported Archive Data List",
-    "export_collections": "Export Collections",
-    "check_all": "Check All",
-    "uncheck_all": "Uncheck All",
-    "desc_password_seed": "DO NOT FORGET to set current <code>PASSWORD_SEED</code> to your new GROWI system when restoring user data, or users will NOT be able to login with their password.<br><br><strong>HINT:</strong><br>The current <code>PASSWORD_SEED</code> will be stored in <code>meta.json</code> in exported ZIP.",
-    "create_new_archive_data": "Create New Archive Data",
-    "export": "Export",
-    "cancel": "Cancel",
-    "file": "File",
-    "growi_version": "Growi Version",
-    "collections": "Collections",
-    "exported_at": "Exported At",
-    "export_menu": "Export Menu",
-    "download": "Download",
-    "delete": "Delete"
   }
 }

resource/locales/ja/admin/export_management.json

@@ -0,0 +1,18 @@
+{
+  "exporting_collection_list": "エクスポート中のコレクション",
+  "exported_data_list": "エクスポートされたアーカイブリスト",
+  "export_collections": "コレクションのエクスポート",
+  "check_all": "全てにチェックを付ける",
+  "uncheck_all": "全てからチェックを外す",
+  "desc_password_seed": "ユーザーデータをバックアップ/リストアする場合、現在の <code>PASSWORD_SEED</code> を新しい GROWI システムにセットすることを忘れないでください。さもなくば、ユーザーがパスワードでログインできなくなります。<br><br><strong>ヒント:</strong><br>現在の <code>PASSWORD_SEED</code> は、エクスポートされる ZIP 中の <code>meta.json</code> に保存されます。",
+  "create_new_archive_data": "アーカイブデータの新規作成",
+  "export": "エクスポート",
+  "cancel": "キャンセル",
+  "file": "ファイル名",
+  "growi_version": "Growi バージョン",
+  "collections": "コレクション",
+  "exported_at": "エクスポートされた時間",
+  "export_menu": "エクスポートメニュー",
+  "download": "ダウンロード",
+  "delete": "削除"
+}

resource/locales/ja/translation.json

@@ -585,23 +585,5 @@
     "rebuild_description_1": "Build Now ボタンを押すと全てのページのインデックスを削除し、作り直します。",
     "rebuild_description_2": "この作業には数秒かかります。",
     "rebuild_description_3": ""
-  },
-  "export_management": {
-    "exporting_collection_list": "エクスポート中のコレクション",
-    "exported_data_list": "エクスポートされたアーカイブリスト",
-    "export_collections": "コレクションのエクスポート",
-    "check_all": "全てにチェックを付ける",
-    "uncheck_all": "全てからチェックを外す",
-    "desc_password_seed": "ユーザーデータをバックアップ/リストアする場合、現在の <code>PASSWORD_SEED</code> を新しい GROWI システムにセットすることを忘れないでください。さもなくば、ユーザーがパスワードでログインできなくなります。<br><br><strong>ヒント:</strong><br>現在の <code>PASSWORD_SEED</code> は、エクスポートされる ZIP 中の <code>meta.json</code> に保存されます。",
-    "create_new_archive_data": "アーカイブデータの新規作成",
-    "export": "エクスポート",
-    "cancel": "キャンセル",
-    "file": "ファイル名",
-    "growi_version": "Growi バージョン",
-    "collections": "コレクション",
-    "exported_at": "エクスポートされた時間",
-    "export_menu": "エクスポートメニュー",
-    "download": "ダウンロード",
-    "delete": "削除"
   }
 }

src/client/js/components/Admin/ExportArchiveData/ArchiveFilesTable.jsx

@@ -19,10 +19,10 @@ class ArchiveFilesTable extends React.Component {
       <table className="table table-bordered">
         <thead>
           <tr>
-            <th>{t('export_management.file')}</th>
-            <th>{t('export_management.growi_version')}</th>
-            <th>{t('export_management.collections')}</th>
-            <th>{t('export_management.exported_at')}</th>
+            <th>{t('export_management:file')}</th>
+            <th>{t('export_management:growi_version')}</th>
+            <th>{t('export_management:collections')}</th>
+            <th>{t('export_management:exported_at')}</th>
             <th></th>
           </tr>
         </thead>

src/client/js/components/Admin/ExportArchiveData/ArchiveFilesTableMenu.jsx

@@ -17,15 +17,15 @@ class ArchiveFilesTableMenu extends React.Component {
           <i className="icon-settings"></i> <span className="caret"></span>
         </button>
         <ul className="dropdown-menu" role="menu">
-          <li className="dropdown-header">{t('export_management.export_menu')}</li>
+          <li className="dropdown-header">{t('export_management:export_menu')}</li>
           <li>
             <a type="button" href={`/admin/export/${this.props.fileName}`}>
-              <i className="icon-cloud-download" /> {t('export_management.download')}
+              <i className="icon-cloud-download" /> {t('export_management:download')}
             </a>
           </li>
           <li>
             <a type="button" role="button" onClick={() => this.props.onZipFileStatRemove(this.props.fileName)}>
-              <span className="text-danger"><i className="icon-trash" /> {t('export_management.delete')}</span>
+              <span className="text-danger"><i className="icon-trash" /> {t('export_management:delete')}</span>
             </a>
           </li>
         </ul>

src/client/js/components/Admin/ExportArchiveData/SelectCollectionsModal.jsx

@@ -117,7 +117,7 @@ class SelectCollectionsModal extends React.Component {
       return <></>;
     }
 
-    const html = this.props.t('export_management.desc_password_seed');
+    const html = this.props.t('export_management:desc_password_seed');
 
     // eslint-disable-next-line react/no-danger
     return <div className="well well-sm" dangerouslySetInnerHTML={{ __html: html }}></div>;
@@ -172,7 +172,7 @@ class SelectCollectionsModal extends React.Component {
     return (
       <Modal show={this.props.isOpen} onHide={this.props.onClose}>
         <Modal.Header closeButton>
-          <Modal.Title>{t('export_management.export_collections')}</Modal.Title>
+          <Modal.Title>{t('export_management:export_collections')}</Modal.Title>
         </Modal.Header>
 
         <form onSubmit={this.export}>
@@ -180,43 +180,43 @@ class SelectCollectionsModal extends React.Component {
             <div className="row">
               <div className="col-sm-12">
                 <button type="button" className="btn btn-sm btn-default mr-2" onClick={this.checkAll}>
-                  <i className="fa fa-check-square-o"></i> {t('export_management.check_all')}
+                  <i className="fa fa-check-square-o"></i> {t('export_management:check_all')}
                 </button>
                 <button type="button" className="btn btn-sm btn-default mr-2" onClick={this.uncheckAll}>
-                  <i className="fa fa-square-o"></i> {t('export_management.uncheck_all')}
+                  <i className="fa fa-square-o"></i> {t('export_management:uncheck_all')}
                 </button>
               </div>
             </div>
             <div className="row mt-4">
               <div className="col-xs-12">
                 <legend>Page Collections</legend>
-                { this.renderGroups(GROUPS_PAGE) }
+                {this.renderGroups(GROUPS_PAGE)}
               </div>
             </div>
             <div className="row mt-4">
               <div className="col-xs-12">
                 <legend>User Collections</legend>
-                { this.renderGroups(GROUPS_USER, 'danger') }
-                { this.renderWarnForUser() }
+                {this.renderGroups(GROUPS_USER, 'danger')}
+                {this.renderWarnForUser()}
               </div>
             </div>
             <div className="row mt-4">
               <div className="col-xs-12">
                 <legend>Config Collections</legend>
-                { this.renderGroups(GROUPS_CONFIG) }
+                {this.renderGroups(GROUPS_CONFIG)}
               </div>
             </div>
             <div className="row mt-4">
               <div className="col-xs-12">
                 <legend>Other Collections</legend>
-                { this.renderOthers() }
+                {this.renderOthers()}
               </div>
             </div>
           </Modal.Body>
 
           <Modal.Footer>
-            <button type="button" className="btn btn-sm btn-default" onClick={this.props.onClose}>{t('export_management.cancel')}</button>
-            <button type="submit" className="btn btn-sm btn-primary" disabled={!this.validateForm()}>{t('export_management.export')}</button>
+            <button type="button" className="btn btn-sm btn-default" onClick={this.props.onClose}>{t('export_management:cancel')}</button>
+            <button type="submit" className="btn btn-sm btn-primary" disabled={!this.validateForm()}>{t('export_management:export')}</button>
           </Modal.Footer>
         </form>
       </Modal>

src/client/js/components/Admin/ExportArchiveDataPage.jsx

@@ -214,19 +214,19 @@ class ExportArchiveDataPage extends React.Component {
         <h2>{t('Export Archive Data')}</h2>
 
         <button type="button" className="btn btn-default" disabled={isExporting} onClick={this.openExportModal}>
-          {t('export_management.create_new_archive_data')}
+          {t('export_management:create_new_archive_data')}
         </button>
 
         { showExportingData && (
           <div className="mt-5">
-            <h3>{t('export_management.exporting_collection_list')}</h3>
+            <h3>{t('export_management:exporting_collection_list')}</h3>
             { this.renderProgressBarsForCollections() }
             { this.renderProgressBarForZipping() }
           </div>
         ) }
 
         <div className="mt-5">
-          <h3>{t('export_management.exported_data_list')}</h3>
+          <h3>{t('export_management:exported_data_list')}</h3>
           <ArchiveFilesTable
             zipFileStats={this.state.zipFileStats}
             onZipFileStatRemove={this.onZipFileStatRemove}