@owlmeans/client-i18n 0.1.4 → 0.1.6

package/build/context.d.ts

@@ -2,7 +2,12 @@ import type { FC } from 'react';
 import type { I18nContextProps } from './types.js';
 import type { TFunction } from 'i18next';
 export declare const I18nContext: FC<I18nContextProps>;
-export declare const useCommonI18n: (resourceName: string, ns?: string, prefix?: string) => TFunction;
+/** Join a parent prefix with a child segment using a dot, handling empty/undefined gracefully. */
+export declare const composePrefix: (parent?: string, child?: string) => string;
+/** Low-level hook: explicit resource name and optional namespace. Use this when
+ *  you need to override both ns and resource independently (e.g. inside panel contexts). */
+export declare const useI18n: (resource: string, ns?: string, prefix?: string) => TFunction;
 export declare const useI18nLib: (libName: string, prefix?: string) => TFunction;
 export declare const useI18nApp: (appName?: string, prefix?: string) => TFunction;
+export declare const useLanguage: () => [string, (lng: string) => void];
 //# sourceMappingURL=context.d.ts.map

package/build/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAKxC,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAI3C,CAAA;AAIF,eAAO,MAAM,aAAa,GAAI,cAAc,MAAM,EAAE,KAAK,MAAM,EAAE,SAAS,MAAM,KAAG,SA2BlF,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,KAAG,SAE7D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,KAAG,SAK9D,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAKxC,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAI3C,CAAA;AAEF,kGAAkG;AAClG,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,KAAG,MAK/D,CAAA;AAyCD;4FAC4F;AAC5F,eAAO,MAAM,OAAO,GAAI,UAAU,MAAM,EAAE,KAAK,MAAM,EAAE,SAAS,MAAM,KAAG,SAExE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,KAAG,SAE7D,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,UAAU,MAAM,EAAE,SAAS,MAAM,KAAG,SAK9D,CAAA;AAED,eAAO,MAAM,WAAW,QAAO,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAU5D,CAAA"}

package/build/context.js

@@ -1,39 +1,69 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { memo } from 'react';
+import { memo, useCallback, useState } from 'react';
 import { I18nextProvider, useTranslation } from 'react-i18next';
-import { useI18nInstance } from './utils/instance.js';
+import { setLanguage, useI18nInstance } from './utils/instance.js';
 import { DEFAULT_LNG, DEFAULT_NAMESPACE, initI18nResource, LIB_NAMESPACE } from '@owlmeans/i18n';
 import { useContext } from '@owlmeans/client';
 export const I18nContext = memo(({ config, children }) => {
     const i18n = useI18nInstance(config);
     return _jsx(I18nextProvider, { i18n: i18n, children: children });
 });
+/** Join a parent prefix with a child segment using a dot, handling empty/undefined gracefully. */
+export const composePrefix = (parent, child) => {
+    if (parent != null && parent !== '' && child != null && child !== '') {
+        return `${parent}.${child}`;
+    }
+    return parent ?? child ?? '';
+};
 const i18nLoadingCache = new Set();
-export const useCommonI18n = (resourceName, ns, prefix) => {
+const useI18nResource = (resourceName, ns, prefix) => {
     const { i18n } = useTranslation();
-    ns = ns ?? (Array.isArray(i18n.options.defaultNS)
+    const resolvedNs = ns ?? (Array.isArray(i18n.options.defaultNS)
         ? i18n.options.defaultNS?.[0] : i18n.options.defaultNS)
         ?? DEFAULT_NAMESPACE;
-    const key = `${i18n.language}:${resourceName}:${ns}`;
+    const key = `${i18n.language}:${resourceName}:${resolvedNs}`;
     if (!i18nLoadingCache.has(key)) {
         i18nLoadingCache.add(key);
-        const resources = initI18nResource(i18n.language, resourceName, ns);
+        const resources = initI18nResource(i18n.language, resourceName, resolvedNs);
         if (resources != null) {
-            resources.forEach(resource => i18n.addResourceBundle(i18n.language, ns ?? DEFAULT_NAMESPACE, { [resourceName]: resource.data }, true, true));
-            const defLng = typeof i18n.options.fallbackLng === 'string' ? i18n.options.fallbackLng : DEFAULT_LNG;
-            const defResources = initI18nResource(defLng, resourceName, ns);
-            defResources?.forEach(resource => i18n.addResourceBundle(i18n.language, ns ?? DEFAULT_NAMESPACE, { [resourceName]: resource.data }, true, true));
+            resources.forEach(resource => i18n.addResourceBundle(i18n.language, resolvedNs, { [resourceName]: resource.data }, true, true));
+        }
+        // Load fallback language bundles into the fallback language slot (not current)
+        const defLng = typeof i18n.options.fallbackLng === 'string' ? i18n.options.fallbackLng : DEFAULT_LNG;
+        if (defLng !== i18n.language) {
+            const fallbackKey = `${defLng}:${resourceName}:${resolvedNs}`;
+            if (!i18nLoadingCache.has(fallbackKey)) {
+                i18nLoadingCache.add(fallbackKey);
+                const defResources = initI18nResource(defLng, resourceName, resolvedNs);
+                defResources?.forEach(resource => i18n.addResourceBundle(defLng, resolvedNs, { [resourceName]: resource.data }, true, true));
+            }
         }
     }
-    const { t } = useTranslation(ns, { keyPrefix: `${resourceName}${prefix != null && prefix != '' ? `.${prefix}` : ''}` });
+    const { t } = useTranslation(resolvedNs, {
+        keyPrefix: composePrefix(resourceName, prefix !== '' ? prefix : undefined)
+    });
     return t;
 };
+/** Low-level hook: explicit resource name and optional namespace. Use this when
+ *  you need to override both ns and resource independently (e.g. inside panel contexts). */
+export const useI18n = (resource, ns, prefix) => {
+    return useI18nResource(resource, ns, prefix);
+};
 export const useI18nLib = (libName, prefix) => {
-    return useCommonI18n(libName, LIB_NAMESPACE, prefix);
+    return useI18nResource(libName, LIB_NAMESPACE, prefix);
 };
 export const useI18nApp = (appName, prefix) => {
     const context = useContext();
-    appName = appName ?? context.cfg.service;
-    return useCommonI18n(appName, appName, prefix);
+    const resolvedName = appName ?? context.cfg.service;
+    return useI18nResource(resolvedName, resolvedName, prefix);
+};
+export const useLanguage = () => {
+    const { i18n } = useTranslation();
+    const [lng, setLng] = useState(i18n.language);
+    const changeLng = useCallback((next) => {
+        setLanguage(next);
+        setLng(next);
+    }, []);
+    return [lng, changeLng];
 };
 //# sourceMappingURL=context.js.map

package/build/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"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"}

package/build/index.d.ts

@@ -1,3 +1,3 @@
 export * from './types.js';
-export * from './context.js';
+export { I18nContext, composePrefix, useI18n, useI18nLib, useI18nApp, useLanguage } from './context.js';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA"}

package/build/index.js

@@ -1,3 +1,3 @@
 export * from './types.js';
-export * from './context.js';
+export { I18nContext, composePrefix, useI18n, useI18nLib, useI18nApp, useLanguage } from './context.js';
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA"}

package/build/utils/instance.d.ts

@@ -2,4 +2,5 @@ import type { i18n } from 'i18next';
 import type { ClientConfig } from '@owlmeans/client-context';
 export declare const useI18nInstance: (config: ClientConfig) => i18n;
 export declare const getI18nInstance: (config: ClientConfig) => i18n;
+export declare const setLanguage: (lng: string) => void;
 //# sourceMappingURL=instance.d.ts.map

package/build/utils/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/utils/instance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAK5D,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY,KAAG,IAItD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY,KAAG,IAC3B,CAAA"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../../src/utils/instance.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAO5D,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY,KAAG,IAItD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,YAAY,KAAG,IAC3B,CAAA;AAE5B,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,KAAG,IAMzC,CAAA"}

package/build/utils/instance.js

@@ -1,21 +1,47 @@
 import { createInstance } from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import { useMemo } from 'react';
-import { DEFAULT_LNG, DEFAULT_NAMESPACE } from '@owlmeans/i18n';
+import { DEFAULT_LNG, DEFAULT_NAMESPACE, SUPPORTED_LNGS } from '@owlmeans/i18n';
+const LNG_STORAGE_KEY = 'owlmeans-lng';
 let i18nInstance = null;
 export const useI18nInstance = (config) => {
     const instance = useMemo(() => createI18nInstance(config), []);
     return instance;
 };
 export const getI18nInstance = (config) => createI18nInstance(config);
+export const setLanguage = (lng) => {
+    if (i18nInstance == null)
+        return;
+    try {
+        localStorage.setItem(LNG_STORAGE_KEY, lng);
+    }
+    catch (_) { /* noop in non-browser environments */ }
+    i18nInstance.changeLanguage(lng);
+};
+const getPersistedLanguage = () => {
+    try {
+        return localStorage.getItem(LNG_STORAGE_KEY);
+    }
+    catch (_) {
+        return null;
+    }
+};
 const createI18nInstance = (config) => {
     if (i18nInstance != null) {
         return i18nInstance;
     }
+    const fallbackLng = config.i18n?.fallbackLng ?? config.i18n?.defaultLng ?? DEFAULT_LNG;
+    const supportedLngs = config.i18n?.supportedLngs ?? [...SUPPORTED_LNGS];
+    const persistedLng = getPersistedLanguage();
+    const lng = persistedLng != null && supportedLngs.includes(persistedLng)
+        ? persistedLng
+        : fallbackLng;
     const instance = createInstance({
         compatibilityJSON: 'v3',
         defaultNS: config.i18n?.defaultNs ?? DEFAULT_NAMESPACE,
-        fallbackLng: config.i18n?.defaultLng ?? DEFAULT_LNG,
+        fallbackLng,
+        lng,
+        supportedLngs,
         debug: config.debug?.all ?? config.debug?.i18n ?? false,
     });
     instance.use(initReactI18next).init();

package/build/utils/instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../src/utils/instance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAE/D,IAAI,YAAY,GAAgB,IAAI,CAAA;AAEpC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAoB,EAAQ,EAAE;IAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;IAE9D,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAoB,EAAQ,EAAE,CAC5D,kBAAkB,CAAC,MAAM,CAAC,CAAA;AAE5B,MAAM,kBAAkB,GAAG,CAAC,MAAoB,EAAQ,EAAE;IACxD,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC;QAC9B,iBAAiB,EAAE,IAAI;QACvB,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,IAAI,iBAAiB;QACtD,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,IAAI,WAAW;QACnD,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,KAAK;KACxD,CAAC,CAAA;IAEF,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAA;IAErC,OAAO,YAAY,GAAG,QAAQ,CAAA;AAChC,CAAC,CAAA"}
+{"version":3,"file":"instance.js","sourceRoot":"","sources":["../../src/utils/instance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAEhD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE/E,MAAM,eAAe,GAAG,cAAc,CAAA;AAEtC,IAAI,YAAY,GAAgB,IAAI,CAAA;AAEpC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAoB,EAAQ,EAAE;IAC5D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAA;IAE9D,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAoB,EAAQ,EAAE,CAC5D,kBAAkB,CAAC,MAAM,CAAC,CAAA;AAE5B,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAQ,EAAE;IAC/C,IAAI,YAAY,IAAI,IAAI;QAAE,OAAM;IAChC,IAAI,CAAC;QACH,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA;IAC5C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,CAAC,sCAAsC,CAAC,CAAC;IACtD,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,GAAkB,EAAE;IAC/C,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;IAC9C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,MAAoB,EAAQ,EAAE;IACxD,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,EAAE,WAAW,IAAI,MAAM,CAAC,IAAI,EAAE,UAAU,IAAI,WAAW,CAAA;IACtF,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,aAAa,IAAI,CAAC,GAAG,cAAc,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,oBAAoB,EAAE,CAAA;IAC3C,MAAM,GAAG,GAAG,YAAY,IAAI,IAAI,IAAI,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC;QACtE,CAAC,CAAC,YAAY;QACd,CAAC,CAAC,WAAW,CAAA;IAEf,MAAM,QAAQ,GAAG,cAAc,CAAC;QAC9B,iBAAiB,EAAE,IAAI;QACvB,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,IAAI,iBAAiB;QACtD,WAAW;QACX,GAAG;QACH,aAAa;QACb,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,IAAI,KAAK;KACxD,CAAC,CAAA;IAEF,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAA;IAErC,OAAO,YAAY,GAAG,QAAQ,CAAA;AAChC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/client-i18n",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -37,9 +37,9 @@
     "typescript": "^6.0.2"
   },
   "dependencies": {
-    "@owlmeans/client": "^0.1.4",
-    "@owlmeans/client-context": "^0.1.4",
-    "@owlmeans/i18n": "^0.1.4",
+    "@owlmeans/client": "^0.1.6",
+    "@owlmeans/client-context": "^0.1.6",
+    "@owlmeans/i18n": "^0.1.6",
     "i18next": "^23.15.1",
     "react-i18next": "^15.0.2"
   },

package/src/context.tsx

@@ -1,9 +1,9 @@
-import { memo } from 'react'
+import { memo, useCallback, useState } from 'react'
 import type { FC } from 'react'
 import type { I18nContextProps } from './types.js'
 import { I18nextProvider, useTranslation } from 'react-i18next'
 import type { TFunction } from 'i18next'
-import { useI18nInstance } from './utils/instance.js'
+import { setLanguage, useI18nInstance } from './utils/instance.js'
 import { DEFAULT_LNG, DEFAULT_NAMESPACE, initI18nResource, LIB_NAMESPACE } from '@owlmeans/i18n'
 import { useContext } from '@owlmeans/client'
 
@@ -13,44 +13,78 @@ export const I18nContext: FC<I18nContextProps> = memo(({ config, children }) =>
   return <I18nextProvider i18n={i18n}>{children}</I18nextProvider>
 })
 
+/** Join a parent prefix with a child segment using a dot, handling empty/undefined gracefully. */
+export const composePrefix = (parent?: string, child?: string): string => {
+  if (parent != null && parent !== '' && child != null && child !== '') {
+    return `${parent}.${child}`
+  }
+  return parent ?? child ?? ''
+}
+
 const i18nLoadingCache = new Set<string>()
 
-export const useCommonI18n = (resourceName: string, ns?: string, prefix?: string): TFunction => {
+const useI18nResource = (resourceName: string, ns?: string, prefix?: string): TFunction => {
   const { i18n } = useTranslation()
 
-  ns = ns ?? (Array.isArray(i18n.options.defaultNS)
-    ? i18n.options.defaultNS?.[0] : i18n.options.defaultNS)
+  const resolvedNs = ns ?? (Array.isArray(i18n.options.defaultNS)
+    ? i18n.options.defaultNS?.[0] : i18n.options.defaultNS as string | undefined)
     ?? DEFAULT_NAMESPACE
 
-  const key = `${i18n.language}:${resourceName}:${ns}`
+  const key = `${i18n.language}:${resourceName}:${resolvedNs}`
   if (!i18nLoadingCache.has(key)) {
     i18nLoadingCache.add(key)
-    const resources = initI18nResource(i18n.language, resourceName, ns)
+    const resources = initI18nResource(i18n.language, resourceName, resolvedNs)
     if (resources != null) {
       resources.forEach(
-        resource => i18n.addResourceBundle(i18n.language, ns ?? DEFAULT_NAMESPACE, { [resourceName]: resource.data }, true, true)
-      )
-
-      const defLng = typeof i18n.options.fallbackLng === 'string' ? i18n.options.fallbackLng : DEFAULT_LNG
-      const defResources = initI18nResource(defLng, resourceName, ns)
-      defResources?.forEach(
-        resource => i18n.addResourceBundle(i18n.language, ns ?? DEFAULT_NAMESPACE, { [resourceName]: resource.data }, true, true)
+        resource => i18n.addResourceBundle(i18n.language, resolvedNs, { [resourceName]: resource.data }, true, true)
       )
     }
+    // Load fallback language bundles into the fallback language slot (not current)
+    const defLng = typeof i18n.options.fallbackLng === 'string' ? i18n.options.fallbackLng : DEFAULT_LNG
+    if (defLng !== i18n.language) {
+      const fallbackKey = `${defLng}:${resourceName}:${resolvedNs}`
+      if (!i18nLoadingCache.has(fallbackKey)) {
+        i18nLoadingCache.add(fallbackKey)
+        const defResources = initI18nResource(defLng, resourceName, resolvedNs)
+        defResources?.forEach(
+          resource => i18n.addResourceBundle(defLng, resolvedNs, { [resourceName]: resource.data }, true, true)
+        )
+      }
+    }
   }
 
-  const { t } = useTranslation(ns, { keyPrefix: `${resourceName}${prefix != null && prefix != '' ? `.${prefix}` : ''}` })
+  const { t } = useTranslation(resolvedNs, {
+    keyPrefix: composePrefix(resourceName, prefix !== '' ? prefix : undefined)
+  })
 
   return t
 }
 
+/** Low-level hook: explicit resource name and optional namespace. Use this when
+ *  you need to override both ns and resource independently (e.g. inside panel contexts). */
+export const useI18n = (resource: string, ns?: string, prefix?: string): TFunction => {
+  return useI18nResource(resource, ns, prefix)
+}
+
 export const useI18nLib = (libName: string, prefix?: string): TFunction => {
-  return useCommonI18n(libName, LIB_NAMESPACE, prefix)
+  return useI18nResource(libName, LIB_NAMESPACE, prefix)
 }
 
 export const useI18nApp = (appName?: string, prefix?: string): TFunction => {
   const context = useContext()
-  appName = appName ?? context.cfg.service
+  const resolvedName = appName ?? context.cfg.service
+
+  return useI18nResource(resolvedName, resolvedName, prefix)
+}
+
+export const useLanguage = (): [string, (lng: string) => void] => {
+  const { i18n } = useTranslation()
+  const [lng, setLng] = useState(i18n.language)
+
+  const changeLng = useCallback((next: string) => {
+    setLanguage(next)
+    setLng(next)
+  }, [])
 
-  return useCommonI18n(appName, appName, prefix)
+  return [lng, changeLng]
 }

package/src/index.ts

@@ -1,3 +1,3 @@
 
 export * from './types.js'
-export * from './context.js'
+export { I18nContext, composePrefix, useI18n, useI18nLib, useI18nApp, useLanguage } from './context.js'

package/src/utils/instance.ts

@@ -4,7 +4,9 @@ import { initReactI18next } from 'react-i18next'
 import type { i18n } from 'i18next'
 import { useMemo } from 'react'
 import type { ClientConfig } from '@owlmeans/client-context'
-import { DEFAULT_LNG, DEFAULT_NAMESPACE } from '@owlmeans/i18n'
+import { DEFAULT_LNG, DEFAULT_NAMESPACE, SUPPORTED_LNGS } from '@owlmeans/i18n'
+
+const LNG_STORAGE_KEY = 'owlmeans-lng'
 
 let i18nInstance: i18n | null = null
 
@@ -17,15 +19,40 @@ export const useI18nInstance = (config: ClientConfig): i18n => {
 export const getI18nInstance = (config: ClientConfig): i18n =>
   createI18nInstance(config)
 
+export const setLanguage = (lng: string): void => {
+  if (i18nInstance == null) return
+  try {
+    localStorage.setItem(LNG_STORAGE_KEY, lng)
+  } catch (_) { /* noop in non-browser environments */ }
+  i18nInstance.changeLanguage(lng)
+}
+
+const getPersistedLanguage = (): string | null => {
+  try {
+    return localStorage.getItem(LNG_STORAGE_KEY)
+  } catch (_) {
+    return null
+  }
+}
+
 const createI18nInstance = (config: ClientConfig): i18n => {
   if (i18nInstance != null) {
     return i18nInstance
   }
 
+  const fallbackLng = config.i18n?.fallbackLng ?? config.i18n?.defaultLng ?? DEFAULT_LNG
+  const supportedLngs = config.i18n?.supportedLngs ?? [...SUPPORTED_LNGS]
+  const persistedLng = getPersistedLanguage()
+  const lng = persistedLng != null && supportedLngs.includes(persistedLng)
+    ? persistedLng
+    : fallbackLng
+
   const instance = createInstance({
     compatibilityJSON: 'v3',
     defaultNS: config.i18n?.defaultNs ?? DEFAULT_NAMESPACE,
-    fallbackLng: config.i18n?.defaultLng ?? DEFAULT_LNG,
+    fallbackLng,
+    lng,
+    supportedLngs,
     debug: config.debug?.all ?? config.debug?.i18n ?? false,
   })