فهرست منبع

i18n login-passport

itizawa 5 سال پیش
والد
کامیت
b22e634e1e
3فایلهای تغییر یافته به همراه9 افزوده شده و 5 حذف شده
  1. 3 1
      resource/locales/en-US/translation.json
  2. 3 1
      resource/locales/ja/translation.json
  3. 3 3
      src/server/routes/login-passport.js

+ 3 - 1
resource/locales/en-US/translation.json

@@ -696,6 +696,8 @@
     "fail_to_fetch_access_token": "Failed to fetch access_token. Please do connect again.",
     "fail_to_fetch_access_token": "Failed to fetch access_token. Please do connect again.",
     "successfully_disconnected": "Successfully Disconnected!",
     "successfully_disconnected": "Successfully Disconnected!",
     "strategy_has_not_been_set_up": "{{strategy}} has not been set up",
     "strategy_has_not_been_set_up": "{{strategy}} has not been set up",
-    "maximum_number_of_users": "Can not register more than the maximum number of users."
+    "maximum_number_of_users": "Can not register more than the maximum number of users.",
+    "database_error": "Database Server Error occured",
+    "sign_in_failure": "Sign in failure."
   }
   }
 }
 }

+ 3 - 1
resource/locales/ja/translation.json

@@ -688,6 +688,8 @@
     "fail_to_fetch_access_token": "アクセストークンの取得に失敗しました、再度お試しください。",
     "fail_to_fetch_access_token": "アクセストークンの取得に失敗しました、再度お試しください。",
     "successfully_disconnected": "切断に成功しました!",
     "successfully_disconnected": "切断に成功しました!",
     "strategy_has_not_been_set_up": "{{strategy}} はセットアップされていません。",
     "strategy_has_not_been_set_up": "{{strategy}} はセットアップされていません。",
-    "maximum_number_of_users": "ユーザー数が上限を超えたためアクティベートできません。"
+    "maximum_number_of_users": "ユーザー数が上限を超えたためアクティベートできません。",
+    "database_error":"データベースサーバーに問題があります。",
+    "sign_in_failure": "ログインに失敗しました。"
   }
   }
 }
 }

+ 3 - 3
src/server/routes/login-passport.js

@@ -34,7 +34,7 @@ module.exports = function(crowi, app) {
    * @param {*} res
    * @param {*} res
    */
    */
   const loginFailureHandler = (req, res, message) => {
   const loginFailureHandler = (req, res, message) => {
-    req.flash('errorMessage', message || 'Sign in failure.');
+    req.flash('errorMessage', message || req.t('message.sign_in_failure'));
     return res.redirect('/login');
     return res.redirect('/login');
   };
   };
 
 
@@ -44,7 +44,7 @@ module.exports = function(crowi, app) {
    * @param {*} res
    * @param {*} res
    */
    */
   const loginFailure = (req, res) => {
   const loginFailure = (req, res) => {
-    return loginFailureHandler(req, res, 'Sign in failure.');
+    return loginFailureHandler(req, res, req.t('message.sign_in_failure'));
   };
   };
 
 
   /**
   /**
@@ -212,7 +212,7 @@ module.exports = function(crowi, app) {
 
 
       if (err) { // DB Error
       if (err) { // DB Error
         logger.error('Database Server Error: ', err);
         logger.error('Database Server Error: ', err);
-        req.flash('warningMessage', 'Database Server Error occured.');
+        req.flash('warningMessage', req.t('message.database_error'));
         return next(); // pass and the flash message is displayed when all of authentications are failed.
         return next(); // pass and the flash message is displayed when all of authentications are failed.
       }
       }
       if (!user) { return next() }
       if (!user) { return next() }