i18n

resource/locales/en-US/translation.json

@@ -162,11 +162,13 @@
   "Password": "Password",
   "Password Settings": "Password Settings",
   "Set new Password": "Set new Password",
-  "Update Password": "Update Password",
-  "Current password": "Current password",
-  "New password": "New password",
-  "Re-enter new password": "Re-enter new password",
-  "Password is not set": "Password is not set",
+    "personal_settings": {
+      "update_password": "Update Password",
+      "current_password": "Current password",
+      "new_password": "New password",
+      "new_password_confirm": "Re-enter new password",
+      "password_is_not_set": "Password is not set"
+    },
   "security_settings": "Security Settings",
   "API Settings": "API Settings",
   "API Token Settings": "API Token Settings",

resource/locales/ja/translation.json

@@ -161,11 +161,13 @@
   "Password": "パスワード",
   "Password Settings": "パスワード設定",
   "Set new Password": "パスワードを新規に設定",
-  "Update Password": "パスワードを更新",
-  "Current password": "現在のパスワード",
-  "New password": "新しいパスワード",
-  "Re-enter new password": "(確認用)",
-  "Password is not set": "パスワードが設定されていません",
+  "personal_settings":{
+    "update_password": "パスワードを更新",
+    "current_password": "現在のパスワード",
+    "new_password": "新しいパスワード",
+    "new_password_confirm": "(確認用)",
+    "password_is_not_set": "パスワードが設定されていません"
+  },
   "security_settings": "セキュリティ設定",
   "API Settings": "API設定",
   "API Token Settings": "API Token設定",

src/client/js/components/Me/PasswordSettings.jsx

@@ -32,7 +32,7 @@ class PasswordSettings extends React.Component {
     try {
       // await personalContainer.updateBasicInfo();
       // TODO
-      toastSuccess(t('toaster.update_successed', { target: t('Basic Info') }));
+      // toastSuccess(t('toaster.update_successed', { target: t('Basic Info') }));
     }
     catch (err) {
       toastError(err);
@@ -58,10 +58,10 @@ class PasswordSettings extends React.Component {
     return (
       <React.Fragment>
         <div className="mb-5 container-fluid">
-          <h2 className="border-bottom">{t('Update Password')}</h2>
+          <h2 className="border-bottom">{t('personal_settings.update_password')}</h2>
         </div>
         <div className="row mb-3">
-          <label htmlFor="oldPassword" className="col-xs-3 text-right">{ t('Current password') }</label>
+          <label htmlFor="oldPassword" className="col-xs-3 text-right">{ t('personal_settings.current_password') }</label>
           <div className="col-xs-6">
             <input
               className="form-control"
@@ -73,7 +73,7 @@ class PasswordSettings extends React.Component {
           </div>
         </div>
         <div className="row mb-3">
-          <label htmlFor="newPassword" className="col-xs-3 text-right">{ t('New password') }</label>
+          <label htmlFor="newPassword" className="col-xs-3 text-right">{t('personal_settings.new_password') }</label>
           <div className="col-xs-6">
             <input
               className="form-control"
@@ -85,7 +85,7 @@ class PasswordSettings extends React.Component {
           </div>
         </div>
         <div className="row mb-3">
-          <label htmlFor="newPasswordConfirm" className="col-xs-3 text-right">{ t('Re-enter new password') }</label>
+          <label htmlFor="newPasswordConfirm" className="col-xs-3 text-right">{t('personal_settings.new_password_confirm') }</label>
           <div className="col-xs-6">
             <input
               className="form-control col-xs-4"