From 8b6c3aa3cec55df860f53697807a7280a66ce1d4 Mon Sep 17 00:00:00 2001
From: Hironsan <hiroki.nakayama.py@gmail.com>
Date: Fri, 25 Nov 2022 16:29:38 +0900
Subject: [PATCH] Simplify rule names

---
 .../components/project/ProjectDescriptionField.vue     |  3 +--
 frontend/components/project/ProjectNameField.vue       |  6 ++----
 frontend/i18n/de/rules.js                              | 10 +++++-----
 frontend/i18n/en/rules.js                              | 10 +++++-----
 frontend/i18n/fr/rules.js                              | 10 +++++-----
 frontend/i18n/zh/rules.js                              | 10 +++++-----
 6 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/frontend/components/project/ProjectDescriptionField.vue b/frontend/components/project/ProjectDescriptionField.vue
index 1aec6313..f97fcf38 100644
--- a/frontend/components/project/ProjectDescriptionField.vue
+++ b/frontend/components/project/ProjectDescriptionField.vue
@@ -24,8 +24,7 @@ export default Vue.extend({
   data() {
     return {
       descriptionRules: [
-        (text: string) =>
-          !isEmptyText(text) || this.$t('rules.descriptionRules.descriptionRequired')
+        (text: string) => !isEmptyText(text) || this.$t('rules.description.required')
       ]
     }
   }
diff --git a/frontend/components/project/ProjectNameField.vue b/frontend/components/project/ProjectNameField.vue
index 54eb64d8..b12e8901 100644
--- a/frontend/components/project/ProjectNameField.vue
+++ b/frontend/components/project/ProjectNameField.vue
@@ -27,11 +27,9 @@ export default Vue.extend({
   data() {
     return {
       projectNameRules: [
+        (text: string) => !isEmptyText(text) || this.$t('rules.projectName.required'),
         (text: string) =>
-          !isEmptyText(text) || this.$t('rules.projectNameRules.projectNameRequired'),
-        (text: string) =>
-          projectNameMustBeLessThan100Characters(text) ||
-          this.$t('rules.projectNameRules.projectNameLessThan100Chars')
+          projectNameMustBeLessThan100Characters(text) || this.$t('rules.projectName.maxLength')
       ]
     }
   }
diff --git a/frontend/i18n/de/rules.js b/frontend/i18n/de/rules.js
index a9b3700f..049f9143 100644
--- a/frontend/i18n/de/rules.js
+++ b/frontend/i18n/de/rules.js
@@ -13,12 +13,12 @@ export default {
   roleRules: {
     roleRequired: 'Rolle wird benötigt'
   },
-  projectNameRules: {
-    projectNameRequired: 'Projektname wird benötigt',
-    projectNameLessThan100Chars: 'Projektname muss kürzer als 100 Zeichen sein'
+  projectName: {
+    required: 'Projektname wird benötigt',
+    maxLength: 'Projektname muss kürzer als 100 Zeichen sein'
   },
-  descriptionRules: {
-    descriptionRequired: 'Beschreibung wird benötigt'
+  description: {
+    required: 'Beschreibung wird benötigt'
   },
   fileFormatRules: {
     fileFormatRequired: 'Dateiformat wird benötigt'
diff --git a/frontend/i18n/en/rules.js b/frontend/i18n/en/rules.js
index dbe77600..ebb66157 100644
--- a/frontend/i18n/en/rules.js
+++ b/frontend/i18n/en/rules.js
@@ -17,12 +17,12 @@ export default {
   roleRules: {
     roleRequired: 'Role is required'
   },
-  projectNameRules: {
-    projectNameRequired: 'Project name is required',
-    projectNameLessThan100Chars: 'Project name must be less than 100 characters'
+  projectName: {
+    required: 'Project name is required',
+    maxLength: 'Project name must be less than 100 characters'
   },
-  descriptionRules: {
-    descriptionRequired: 'Description is required'
+  description: {
+    required: 'Description is required'
   },
   fileFormatRules: {
     fileFormatRequired: 'File format is required'
diff --git a/frontend/i18n/fr/rules.js b/frontend/i18n/fr/rules.js
index 9aa8db27..4ee5c0ef 100644
--- a/frontend/i18n/fr/rules.js
+++ b/frontend/i18n/fr/rules.js
@@ -17,12 +17,12 @@ export default {
   roleRules: {
     roleRequired: 'Le rôle est obligatoire'
   },
-  projectNameRules: {
-    projectNameRequired: 'Le nom du projet est requis',
-    projectNameLessThan100Chars: 'Le nom du projet doit comporter moins de 100 caractères'
+  projectName: {
+    required: 'Le nom du projet est requis',
+    maxLength: 'Le nom du projet doit comporter moins de 100 caractères'
   },
-  descriptionRules: {
-    descriptionRequired: 'Une description est requise'
+  description: {
+    required: 'Une description est requise'
   },
   fileFormatRules: {
     fileFormatRequired: 'Le format de fichier est requis'
diff --git a/frontend/i18n/zh/rules.js b/frontend/i18n/zh/rules.js
index 76daebf2..ce73b7aa 100644
--- a/frontend/i18n/zh/rules.js
+++ b/frontend/i18n/zh/rules.js
@@ -17,12 +17,12 @@ export default {
   roleRules: {
     roleRequired: '请输入角色'
   },
-  projectNameRules: {
-    projectNameRequired: '请输入项目名称',
-    projectNameLessThan100Chars: '项目名称必须少于100个字符'
+  projectName: {
+    required: '请输入项目名称',
+    maxLength: '项目名称必须少于100个字符'
   },
-  descriptionRules: {
-    descriptionRequired: '请输入描述'
+  description: {
+    required: '请输入描述'
   },
   fileFormatRules: {
     fileFormatRequired: '请输入文件类型'