Parcourir la source

Use getTranslation

shironegi39 il y a 1 an
Parent
commit
e3e51858d8

+ 6 - 4
apps/app/src/server/routes/apiv3/security-settings/index.js

@@ -7,6 +7,7 @@ import { generateAddActivityMiddleware } from '~/server/middlewares/add-activity
 import { apiV3FormValidator } from '~/server/middlewares/apiv3-form-validator';
 import ShareLink from '~/server/models/share-link';
 import { configManager } from '~/server/service/config-manager';
+import { getTranslation } from '~/server/service/i18next';
 import loggerFactory from '~/utils/logger';
 import { validateDeleteConfigs, prepareDeleteConfigValuesForCalc } from '~/utils/page-delete-config';
 
@@ -934,6 +935,7 @@ module.exports = (crowi) => {
    *                  $ref: '#/components/schemas/SamlAuthSetting'
    */
   router.put('/saml', loginRequiredStrictly, adminRequired, addActivity, validator.samlAuth, apiV3FormValidator, async(req, res) => {
+    const { t } = await getTranslation();
 
     //  For the value of each mandatory items,
     //  check whether it from the environment variables is empty and form value to update it is empty
@@ -943,12 +945,12 @@ module.exports = (crowi) => {
       const key = configKey.replace('security:passport-saml:', '');
       const formValue = req.body[key];
       if (configManager.getConfigFromEnvVars('crowi', configKey) === null && formValue == null) {
-        const formItemName = req.t(`security_setting.form_item_name.${key}`);
-        invalidValues.push(req.t('form_validation.required', formItemName));
+        const formItemName = t(`security_setting.form_item_name.${key}`);
+        invalidValues.push(t('form_validation.required', formItemName));
       }
     }
     if (invalidValues.length !== 0) {
-      return res.apiv3Err(req.t('form_validation.error_message'), 400, invalidValues);
+      return res.apiv3Err(t('form_validation.error_message'), 400, invalidValues);
     }
 
     const rule = req.body.ABLCRule;
@@ -959,7 +961,7 @@ module.exports = (crowi) => {
         crowi.passportService.parseABLCRule(rule);
       }
       catch (err) {
-        return res.apiv3Err(req.t('form_validation.invalid_syntax', req.t('security_settings.form_item_name.ABLCRule')), 400);
+        return res.apiv3Err(t('form_validation.invalid_syntax', t('security_settings.form_item_name.ABLCRule')), 400);
       }
     }
 

+ 8 - 5
apps/app/src/server/routes/apiv3/user-activation.ts

@@ -8,6 +8,7 @@ import { SupportedAction } from '~/interfaces/activity';
 import { RegistrationMode } from '~/interfaces/registration-mode';
 import UserRegistrationOrder from '~/server/models/user-registration-order';
 import { configManager } from '~/server/service/config-manager';
+import { getTranslation } from '~/server/service/i18next';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:routes:apiv3:user-activation');
@@ -75,6 +76,8 @@ export const completeRegistrationAction = (crowi) => {
   } = crowi;
 
   return async function(req, res) {
+    const { t } = await getTranslation();
+
     if (req.user != null) {
       return res.apiv3Err(new ErrorV3('You have been logged in', 'registration-failed'), 403);
     }
@@ -103,16 +106,16 @@ export const completeRegistrationAction = (crowi) => {
       let errorMessage = '';
       if (!User.isEmailValid(email)) {
         isError = true;
-        errorMessage += req.t('message.email_address_could_not_be_used');
+        errorMessage += t('message.email_address_could_not_be_used');
       }
       if (!isRegisterable) {
         if (!errOn.username) {
           isError = true;
-          errorMessage += req.t('message.user_id_is_not_available');
+          errorMessage += t('message.user_id_is_not_available');
         }
         if (!errOn.email) {
           isError = true;
-          errorMessage += req.t('message.email_address_is_already_registered');
+          errorMessage += t('message.email_address_is_already_registered');
         }
       }
       if (isError) {
@@ -122,10 +125,10 @@ export const completeRegistrationAction = (crowi) => {
       User.createUserByEmailAndPassword(name, username, email, password, undefined, async(err, userData) => {
         if (err) {
           if (err.name === 'UserUpperLimitException') {
-            errorMessage = req.t('message.can_not_register_maximum_number_of_users');
+            errorMessage = t('message.can_not_register_maximum_number_of_users');
           }
           else {
-            errorMessage = req.t('message.failed_to_register');
+            errorMessage = t('message.failed_to_register');
           }
           return res.apiv3Err(new ErrorV3(errorMessage, 'registration-failed'), 403);
         }