Merge pull request #1732 from riganti/fix-globalizedate-errormsg

Fix error message in dotvvm.formatString date parsing
riganti · Nov 11, 2023 · a9bd0fa · a9bd0fa
2 parents 1bbbe0a + 9f26146
commit a9bd0fa
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/Framework/Framework/Resources/Scripts/DotVVM.Globalize.ts b/src/Framework/Framework/Resources/Scripts/DotVVM.Globalize.ts
@@ -32,35 +32,34 @@ type GlobalizeFormattable = null | undefined | string | Date | number
 
 export function formatString(format: string | null | undefined, value: GlobalizeFormattable | KnockoutObservable<GlobalizeFormattable>, type: string | null) {
     value = ko.unwrap(value);
+    const originalValue = value;
     if (value == null || value === "") {
         return "";
     }
 
+    if (format === "") {
+        format = null
+    }
+
     if (typeof value === "string") {
 
         // DateTime, DateOnly or TimeOnly
         if (type === "dateonly") {
             value = serializationParseDateOnly(value);
-            if (format == null || format.length == 0) {
-                format = "D";
-            }
+            format ??= "D"
         } else if (type == "timeonly") {
             value = serializationParseTimeOnly(value);
-            if (format == null || format.length == 0) {
-                format = "T";
-            }
+            format ??= "T"
         } else {
             value = serializationParseDate(value);
         }
 
         if (value == null) {
-            throw new Error(`Could not parse ${value} as a date`);
+            throw new Error(`Could not parse ${originalValue} as a ${type || "date"}`);
         }
     }
 
-    if (format == null || format.length == 0) {
-        format = "G";
-    }
+    format ??= "G"
 
     return getGlobalize().format(value, format, getCulture());
 }