added option of custom description translation key that could be set …

…in the schema object
david-loe · Jul 5, 2024 · a168047 · a168047
1 parent bf1dd9c
commit a168047
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/backend/models/settings.ts b/backend/models/settings.ts
@@ -63,7 +63,6 @@ const retentionPolicy = {} as {
     min: number
     required: true
     validate: { validator: any; message: string }
-    description: string
   }
 }
 for (const policy of retention) {
@@ -74,8 +73,7 @@ for (const policy of retention) {
     validate: {
       validator: Number.isInteger,
       message: 'Must be Integer'
-    },
-    description: ''
+    }
   }
 }
 

diff --git a/backend/models/vueformGenerator.ts b/backend/models/vueformGenerator.ts
@@ -52,15 +52,25 @@ function mapSchemaTypeToVueformElement(
     vueformElement['rules'].push('max:' + schemaType.max)
   }
 
-  if (schemaType.description !== undefined) {
-    vueformElement['description'] = translate('description.' + labelStr, language)
+  if (schemaType.description) {
+    vueformElement['description'] = translate(schemaType.description, language)
+  } else if (labelStr) {
+    let description = translate('description.' + labelStr, language) as { de: string; en: string }
+    if (description.de) {
+      console.log(description.de)
+      console.log('description.' + labelStr)
+      if (!(description.de === 'description.' + labelStr)) {
+        vueformElement['description'] = translate('description.' + labelStr, language)
+      }
+    }
   }
 
   if (schemaType.label) {
     vueformElement['label'] = translate(schemaType.label, language)
   } else if (labelStr) {
     vueformElement['label'] = translate('labels.' + labelStr, language)
   }
+
   if (schemaType.info) {
     vueformElement['info'] = translate(schemaType.info, language)
   }