@dso-toolkit/core 66.2.0 → 67.0.0-ghi-2365.0

package/dist/cjs/{i18n-a63b3b9b.js → i18n-f7bc1cee.js}

@@ -495,17 +495,16 @@ class Translator extends EventEmitter {
       if (m && m.length > 0) {
         return {
           key,
-          namespaces
+          namespaces: isString(namespaces) ? [namespaces] : namespaces
         };
       }
       const parts = key.split(nsSeparator);
       if (nsSeparator !== keySeparator || nsSeparator === keySeparator && this.options.ns.indexOf(parts[0]) > -1) namespaces = parts.shift();
       key = parts.join(keySeparator);
     }
-    if (isString(namespaces)) namespaces = [namespaces];
     return {
       key,
-      namespaces
+      namespaces: isString(namespaces) ? [namespaces] : namespaces
     };
   }
   translate(keys, options, lastKey) {
@@ -1496,22 +1495,37 @@ class Formatter {
     this.logger = baseLogger.create('formatter');
     this.options = options;
     this.formats = {
-      number: createCachedFormatter((lng, opt) => val => new Intl.NumberFormat(lng, {
-        ...opt
-      }).format(val)),
-      currency: createCachedFormatter((lng, opt) => val => new Intl.NumberFormat(lng, {
-        ...opt,
-        style: 'currency'
-      }).format(val)),
-      datetime: createCachedFormatter((lng, opt) => val => new Intl.DateTimeFormat(lng, {
-        ...opt
-      }).format(val)),
-      relativetime: createCachedFormatter((lng, opt) => val => new Intl.RelativeTimeFormat(lng, {
-        ...opt
-      }).format(val, opt.range || 'day')),
-      list: createCachedFormatter((lng, opt) => val => new Intl.ListFormat(lng, {
-        ...opt
-      }).format(val))
+      number: createCachedFormatter((lng, opt) => {
+        const formatter = new Intl.NumberFormat(lng, {
+          ...opt
+        });
+        return val => formatter.format(val);
+      }),
+      currency: createCachedFormatter((lng, opt) => {
+        const formatter = new Intl.NumberFormat(lng, {
+          ...opt,
+          style: 'currency'
+        });
+        return val => formatter.format(val);
+      }),
+      datetime: createCachedFormatter((lng, opt) => {
+        const formatter = new Intl.DateTimeFormat(lng, {
+          ...opt
+        });
+        return val => formatter.format(val);
+      }),
+      relativetime: createCachedFormatter((lng, opt) => {
+        const formatter = new Intl.RelativeTimeFormat(lng, {
+          ...opt
+        });
+        return val => formatter.format(val, opt.range || 'day');
+      }),
+      list: createCachedFormatter((lng, opt) => {
+        const formatter = new Intl.ListFormat(lng, {
+          ...opt
+        });
+        return val => formatter.format(val);
+      })
     };
     this.init(options);
   }
@@ -2350,30 +2364,33 @@ const instance = I18n.createInstance();
 instance.createInstance = I18n.createInstance;
 
 const DEFAULT_LANG = "nl";
-function getComponentClosestLanguage(el) {
-    let element = el;
-    let closestElement = element.closest("[lang]");
-    while (element && element.parentNode !== document && !closestElement) {
-        element = element.parentNode instanceof ShadowRoot ? element.parentNode.host : element.parentElement;
-        if (element !== null) {
-            closestElement = element.closest("[lang]");
-        }
+function getComponentClosestLanguage(element) {
+    const closestLangElement = element.closest("[lang]");
+    if (closestLangElement instanceof HTMLElement) {
+        return closestLangElement.lang || DEFAULT_LANG;
+    }
+    if (element.parentNode instanceof ShadowRoot && element.parentNode.host instanceof HTMLElement) {
+        return getComponentClosestLanguage(element.parentNode.host);
+    }
+    if (element.parentElement instanceof HTMLElement) {
+        return getComponentClosestLanguage(element.parentElement);
     }
-    return closestElement ? closestElement.lang : DEFAULT_LANG;
+    return DEFAULT_LANG;
 }
 function i18n(getElement, resources) {
     const element = getElement();
     const i18NextInstance = instance.createInstance();
     i18NextInstance.init({
-        lng: getComponentClosestLanguage(element),
         fallbackLng: DEFAULT_LANG,
         resources,
         defaultNS: element.tagName.toLowerCase(),
     });
-    const detectedLanguage = false;
+    let detectedLanguage = false;
     return (key, variables) => {
         if (!detectedLanguage) {
-            i18NextInstance.language = getComponentClosestLanguage(element);
+            detectedLanguage = true;
+            const language = getComponentClosestLanguage(element);
+            i18NextInstance.changeLanguage(language);
         }
         return i18NextInstance.t(key, variables);
     };
@@ -2381,4 +2398,4 @@ function i18n(getElement, resources) {
 
 exports.i18n = i18n;
 
-//# sourceMappingURL=i18n-a63b3b9b.js.map
+//# sourceMappingURL=i18n-f7bc1cee.js.map