zahmis 5 лет назад
Родитель
Сommit
591a17b38e

+ 2 - 0
resource/locales/en_US/admin/admin.json

@@ -202,6 +202,8 @@
       "test_connection": "Test connection to qiita:team"
       "test_connection": "Test connection to qiita:team"
     },
     },
     "import": "Import",
     "import": "Import",
+    "skip_username_and_email_when_overlapped": "Skip username and email using same username and email in new environment",
+    "prepare_new_account_for_migration":"Prepare new account for migration",
     "page_skip": "Pages with a name that already exists on GROWI are not imported",
     "page_skip": "Pages with a name that already exists on GROWI are not imported",
     "Directory_hierarchy_tag": "Directory hierarchy tag"
     "Directory_hierarchy_tag": "Directory hierarchy tag"
   },
   },

+ 2 - 0
resource/locales/ja_JP/admin/admin.json

@@ -220,6 +220,8 @@
       "test_connection": "接続テスト"
       "test_connection": "接続テスト"
     },
     },
     "import": "インポート",
     "import": "インポート",
+    "skip_username_and_email_when_overlapped": "ユーザー名またはメールアドレスが同じ場合、その部分がスキップされます。",
+    "prepare_new_account_for_migration":"移行用のアカウントを新環境で用意してください。",
     "page_skip": "既に GROWI 側に同名のページが存在する場合、そのページはスキップされます",
     "page_skip": "既に GROWI 側に同名のページが存在する場合、そのページはスキップされます",
     "Directory_hierarchy_tag": "ディレクトリ階層タグ"
     "Directory_hierarchy_tag": "ディレクトリ階層タグ"
   },
   },

+ 3 - 1
resource/locales/zh_CN/admin/admin.json

@@ -217,7 +217,9 @@
 			"access_token": "Access token",
 			"access_token": "Access token",
 			"test_connection": "Test connection to qiita:team"
 			"test_connection": "Test connection to qiita:team"
 		},
 		},
-		"import": "Import",
+    "import": "Import",
+    "skip_username_and_email_when_overlapped": "Skip username and email using same username and email in new environment",
+    "prepare_new_account_for_migration":"Prepare new account for migration",
 		"page_skip": "Pages with a name that already exists on GROWI are not imported",
 		"page_skip": "Pages with a name that already exists on GROWI are not imported",
 		"Directory_hierarchy_tag": "Directory hierarchy tag"
 		"Directory_hierarchy_tag": "Directory hierarchy tag"
 	},
 	},

+ 2 - 1
src/client/js/components/Admin/ImportData/GrowiArchiveSection.jsx

@@ -102,7 +102,8 @@ class GrowiArchiveSection extends React.Component {
 
 
         <div className="card well mb-0 small">
         <div className="card well mb-0 small">
           <ul>
           <ul>
-            <li>ユーザー名またはメールアドレスが新環境で存在する場合、新環境で一時的に変更してください。</li>
+            <li>{t('admin:importer_management.skip_username_and_email_when_overlapped')}</li>
+            <li>{t('admin:importer_management.prepare_new_account_for_migration')}</li>
           </ul>
           </ul>
         </div>
         </div>
       </Fragment>
       </Fragment>