Merge pull request #29 from AitorDB/bugfix/fix-fi-time-format

AitorDB · web-flow · commit 60dabd88da5e · 2021-05-18T08:38:26.000+01:00
Fix for Finnish time format and fallback
diff --git a/src/index.ts b/src/index.ts
@@ -83,11 +83,17 @@ class SunCard extends LitElement {
     return (date.getHours() * 60) + date.getMinutes()
   }
 
-  parseTime (timeText: string) {
-    const regex = /\d{1,2}:\d{1,2}|[AMP]+/g
+  parseTime (timeText: string, locale?: string) {
+    const regex = /\d{1,2}[:.]\d{1,2}|[AMP]+/g
     const date = new Date(timeText)
     const { language, timeFormat } = this.getConfig()
-    const [time, period] = date.toLocaleTimeString(language, { hour12: timeFormat === '12h' }).match(regex) as [string, ('AM' | 'PM')?]
+    const result = date.toLocaleTimeString(locale ?? language, { hour12: timeFormat === '12h' }).match(regex) as [string, ('AM' | 'PM')?]
+
+    if (!result && !locale) {
+      return this.parseTime(timeText, Constants.DEFAULT_CONFIG.language)
+    }
+
+    const [time, period] = result
     return { time, period }
   }
 
