@fkui/i18next-translate 6.38.0 → 6.40.0

package/dist/esm/index.js

@@ -2037,7 +2037,7 @@ function createScreenReaderWrapper(options) {
         wrapper.id = "fkui-alert-screen-reader";
         wrapper.className = "sr-only";
         updateProperties();
-        document.body.appendChild(wrapper);
+        document.body.append(wrapper);
     }
 }
 /**
@@ -2254,7 +2254,7 @@ const deepFind = (obj, path, keySeparator = '.') => {
   }
   return current;
 };
-const getCleanedCode = code => code?.replace('_', '-');
+const getCleanedCode = code => code?.replace(/_/g, '-');
 
 const consoleLogger = {
   type: 'logger',
@@ -2515,7 +2515,16 @@ function keysFromSelector(selector, opts) {
   const {
     [PATH_KEY]: path
   } = selector(createProxy());
-  return path.join(opts?.keySeparator ?? '.');
+  const keySeparator = opts?.keySeparator ?? '.';
+  const nsSeparator = opts?.nsSeparator ?? ':';
+  if (path.length > 1 && nsSeparator) {
+    const ns = opts?.ns;
+    const nsArray = Array.isArray(ns) ? ns : null;
+    if (nsArray && nsArray.length > 1 && nsArray.slice(1).includes(path[0])) {
+      return `${path[0]}${nsSeparator}${path.slice(1).join(keySeparator)}`;
+    }
+  }
+  return path.join(keySeparator);
 }
 
 const checkedLoadedFor = {};
@@ -2589,6 +2598,10 @@ class Translator extends EventEmitter {
       ...opt
     });
     if (!Array.isArray(keys)) keys = [String(keys)];
+    keys = keys.map(k => typeof k === 'function' ? keysFromSelector(k, {
+      ...this.options,
+      ...opt
+    }) : String(k));
     const returnDetails = opt.returnDetails !== undefined ? opt.returnDetails : this.options.returnDetails;
     const keySeparator = opt.keySeparator !== undefined ? opt.keySeparator : this.options.keySeparator;
     const {
@@ -2835,6 +2848,10 @@ class Translator extends EventEmitter {
     let usedLng;
     let usedNS;
     if (isString(keys)) keys = [keys];
+    if (Array.isArray(keys)) keys = keys.map(k => typeof k === 'function' ? keysFromSelector(k, {
+      ...this.options,
+      ...opt
+    }) : k);
     keys.forEach(k => {
       if (this.isValidLookup(found)) return;
       const extracted = this.extractFromKey(k, opt);
@@ -3764,7 +3781,11 @@ const bindMemberFunctions = inst => {
   });
 };
 const SUPPORT_NOTICE_KEY = '__i18next_supportNoticeShown';
-const getSupportNoticeShown = () => typeof globalThis !== 'undefined' && !!globalThis[SUPPORT_NOTICE_KEY];
+const getSupportNoticeShown = () => {
+  if (typeof globalThis !== 'undefined' && !!globalThis[SUPPORT_NOTICE_KEY]) return true;
+  if (typeof process !== 'undefined' && process.env && process.env.I18NEXT_NO_SUPPORT_NOTICE) return true;
+  return false;
+};
 const setSupportNoticeShown = () => {
   if (typeof globalThis !== 'undefined') globalThis[SUPPORT_NOTICE_KEY] = true;
 };
@@ -3833,7 +3854,7 @@ class I18n extends EventEmitter {
       this.options.overloadTranslationOptionHandler = defOpts.overloadTranslationOptionHandler;
     }
     if (this.options.showSupportNotice !== false && !usesLocize(this) && !getSupportNoticeShown()) {
-      if (typeof console !== 'undefined' && typeof console.info !== 'undefined') console.info('🌐 i18next is maintained with support from Locize — consider powering your project with managed localization (AI, CDN, integrations): https://locize.com 💙');
+      if (typeof console !== 'undefined' && typeof console.info !== 'undefined') console.info('🌐 i18next is made possible by our own product, Locize — consider powering your project with managed localization (AI, CDN, integrations): https://locize.com 💙');
       setSupportNoticeShown();
     }
     const createClassOnDemand = ClassOrObject => {
@@ -4096,21 +4117,20 @@ class I18n extends EventEmitter {
       o.lngs = o.lngs || fixedT.lngs;
       o.ns = o.ns || fixedT.ns;
       if (o.keyPrefix !== '') o.keyPrefix = o.keyPrefix || keyPrefix || fixedT.keyPrefix;
+      const selectorOpts = {
+        ...this.options,
+        ...o
+      };
+      if (typeof o.keyPrefix === 'function') o.keyPrefix = keysFromSelector(o.keyPrefix, selectorOpts);
       const keySeparator = this.options.keySeparator || '.';
       let resultKey;
       if (o.keyPrefix && Array.isArray(key)) {
         resultKey = key.map(k => {
-          if (typeof k === 'function') k = keysFromSelector(k, {
-            ...this.options,
-            ...opts
-          });
+          if (typeof k === 'function') k = keysFromSelector(k, selectorOpts);
           return `${o.keyPrefix}${keySeparator}${k}`;
         });
       } else {
-        if (typeof key === 'function') key = keysFromSelector(key, {
-          ...this.options,
-          ...opts
-        });
+        if (typeof key === 'function') key = keysFromSelector(key, selectorOpts);
         resultKey = o.keyPrefix ? `${o.keyPrefix}${keySeparator}${key}` : key;
       }
       return this.t(resultKey, o);