Use regex

Author: marla-singer

apinf_packages/core/helper_functions/format_date.js

@@ -24,6 +24,9 @@ export function formatDate (date, dateFormat = 'LL') {
 }
 
 export function getLocaleDateFormat () {
+  // Use regex to define Finnish locale for different browsers
+  const regex = RegExp('fi*');
+
   // Get locale
   const locale = navigator.languages ? navigator.languages[0] :
     (navigator.language || navigator.userLanguage);
@@ -33,15 +36,13 @@ export function getLocaleDateFormat () {
   // Get locale data
   const localeData = moment.localeData();
 
-  let format = localeData.longDateFormat('L');
+  const format = localeData.longDateFormat('L');
 
-  if (locale === 'fi') {
+  if (regex.text(locale)) {
     // Remove year part (save the last dot)
-    format = format.replace(/YYYY/, '');
-  } else {
-    // Remove year part
-    format = format.replace(/.YYYY/, '');
+    return format.replace(/YYYY/, '');
   }
 
-  return format;
+  // Remove year part
+  return format.replace(/.YYYY/, '');
 }