Yuki Takei 1 год назад
Родитель
Сommit
ffd406a141

+ 2 - 2
apps/app/public/static/locales/en_US/translation.json

@@ -170,8 +170,8 @@
     },
     "message": {
       "error_message": "Some values ​​are incorrect",
-      "required": "%s is required",
-      "invalid_syntax": "The syntax of %s is invalid.",
+      "required": "'{{param}}' is required",
+      "invalid_syntax": "The syntax of {{syntax}} is invalid.",
       "title_required": "Title is required.",
       "field_required": "{{target}} is required"
     }

+ 2 - 2
apps/app/public/static/locales/fr_FR/translation.json

@@ -170,8 +170,8 @@
     },
     "message": {
       "error_message": "Des champs sont invalides",
-      "required": "%s est requis",
-      "invalid_syntax": "La syntaxe de %s est invalide.",
+      "required": "'{{param}}' est requis",
+      "invalid_syntax": "La syntaxe de {{syntax}} est invalide.",
       "title_required": "Titre requis.",
       "field_required": "{{target}} est requis"
     }

+ 2 - 2
apps/app/public/static/locales/ja_JP/translation.json

@@ -171,8 +171,8 @@
     },
     "message": {
       "error_message": "いくつかの値が設定されていません",
-      "required": "%sに値を入力してください",
-      "invalid_syntax": "%sの構文が不正です",
+      "required": "'{{param}}' に値を入力してください",
+      "invalid_syntax": "{{syntax}} の構文が不正です",
       "title_required": "タイトルを入力してください",
       "field_required": "{{target}}に値を入力してください"
     }

+ 2 - 2
apps/app/public/static/locales/zh_CN/translation.json

@@ -177,8 +177,8 @@
     },
     "message": {
       "error_message": "有些值不正确",
-      "required": "%s 是必需的",
-      "invalid_syntax": "%s的语法无效。",
+      "required": "'{{param}}' 是必需的",
+      "invalid_syntax": "{{syntax}} 的语法无效。",
       "title_required": "标题是必需的。",
       "field_required": "{{target}} 是必需的"
     }

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

@@ -943,7 +943,7 @@ module.exports = (crowi) => {
       const formValue = req.body[key];
       if (configManager.getConfigFromEnvVars('crowi', configKey) === null && formValue == null) {
         const formItemName = t(`security_setting.form_item_name.${key}`);
-        invalidValues.push(t('input_validation.message.required', formItemName));
+        invalidValues.push(t('input_validation.message.required', { param: formItemName }));
       }
     }
     if (invalidValues.length !== 0) {
@@ -958,7 +958,7 @@ module.exports = (crowi) => {
         crowi.passportService.parseABLCRule(rule);
       }
       catch (err) {
-        return res.apiv3Err(t('input_validation.message.invalid_syntax', t('security_settings.form_item_name.ABLCRule')), 400);
+        return res.apiv3Err(t('input_validation.message.invalid_syntax', { syntax: t('security_settings.form_item_name.ABLCRule') }), 400);
       }
     }