Merge remote-tracking branch 'origin/master' into feature/scoring2

CHANGES.md

@@ -1,33 +1,51 @@
+## 16.3.1
+
+---
+
+- Included bugfix from version 16.2.3 in current version
+
+## 16.3.0
+
+---
+
+- Changed default validation mode to onTouched
+
+## 16.2.3
+
+---
+
+- Bugfix in attachment: Wrong validation texts were displayed on error
 
 ## 16.2.2
 
 ---
-- Formatted code
 
+- Formatted code
 
 ## 16.2.1
 
 ---
-- Support for Microweb Form buttons override in case custom props is set
 
+- Support for Microweb Form buttons override in case custom props is set
 
 ## 16.2.0
 
 ---
+
 - Support for accepting a prop for rendering your own action buttons in the form component
 - Updated props description for form component
 
-
 ## 16.1.0
 
 ---
+
 - Support for Microweb Step in refero
 - Callbacks and override for formbuttons
 
-
 ## 16.0.9
 
 ---
+
 - add dompurify to peerdependencies and remove from dependencies
 - Bugfix: fix decimal field to only accept numbers and one period
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helsenorge/refero",
-  "version": "16.2.2",
+  "version": "16.3.1",
   "description": "Refero is a library that uses a fhir r4 schema and creates a interactive form using helsenorge packages.",
   "keywords": [
     "react",

preview/resources/referoResources.ts

@@ -64,7 +64,8 @@ export const getResources = (language: string): Resources => {
       previousStep: 'Previous',
       attachmentError_required: 'Upload file',
       attachmentError_minFiles: 'Add at least {0} file(s)',
-      attachmentError_maxFiles: 'Maximum of {0} file(s) are allowed',
+      attachmentError_maxFiles: 'Maximum of {1} file(s) are allowed',
+      attachmentError_minFiles_and_maxFiles: 'At least {0} file(s) and a maximum of {1} file(s) are allowed',
       attachmentError_fileSize: 'File size must be less than {0}MB',
       attachmentError_fileType: 'Allowed file types are:',
       dateError_invalid: 'Invalid date',
@@ -152,7 +153,8 @@ export const getResources = (language: string): Resources => {
       previousStep: 'Précédent',
       attachmentError_required: 'Upload file',
       attachmentError_minFiles: 'Add at least {0} file(s)',
-      attachmentError_maxFiles: 'Maximum of {0} file(s) are allowed',
+      attachmentError_maxFiles: 'Maximum of {1} file(s) are allowed',
+      attachmentError_minFiles_and_maxFiles: 'At least {0} file(s) and a maximum of {1} file(s) are allowed',
       attachmentError_fileSize: 'File size must be less than {0}MB',
       attachmentError_fileType: 'Allowed file types are:',
       dateError_invalid: 'Invalid date',
@@ -239,7 +241,8 @@ export const getResources = (language: string): Resources => {
     previousStep: 'Forrige',
     attachmentError_required: 'Last opp fil',
     attachmentError_minFiles: 'Legg til minst {0} fil(er)',
-    attachmentError_maxFiles: 'Maks {0} fil(er) er tillatt',
+    attachmentError_maxFiles: 'Maks {1} fil(er) er tillatt',
+    attachmentError_minFiles_and_maxFiles: 'Minst {0} fil(er) og maks {1} fil(er) er tillatt',
     attachmentError_fileSize: 'Filstørrelse må være mindre enn {0}MB',
     attachmentError_fileType: 'Tillatte filtyper er:',
     dateError_invalid: 'Ugyldig dato',