@tolgee/core 5.7.3 → 5.8.0

package/lib/Controller/Controller.d.ts

@@ -5,7 +5,7 @@ declare type StateServiceProps = {
 export declare const Controller: ({ options }: StateServiceProps) => Readonly<{
     init: (options: Partial<TolgeeOptions>) => void;
     changeLanguage: (language: string) => Promise<void>;
-    getTranslation: ({ key, ns }: KeyAndNamespacesInternal) => string | undefined;
+    getTranslation: ({ key, ns, language }: KeyAndNamespacesInternal) => string | undefined;
     changeTranslation: (descriptor: CacheDescriptor, key: string, value: string) => {
         revert: () => void;
     };

package/lib/types/general.d.ts

@@ -12,6 +12,7 @@ export declare type TranslateOptions = {
     ns?: NsType | null;
     noWrap?: boolean;
     orEmpty?: boolean;
+    language?: string;
 };
 export declare type TranslateProps<T = DefaultParamType, K extends string = TranslationKey> = {
     key: K;
@@ -30,5 +31,5 @@ export declare type TFnType<T = DefaultParamType, R = string, K extends string =
     (key: K, options?: CombinedOptions<T>): R;
     (props: TranslateProps<T, K>): R;
 };
-export declare type KeyAndNamespacesInternal = Pick<TranslatePropsInternal, 'key' | 'ns'>;
+export declare type KeyAndNamespacesInternal = Pick<TranslatePropsInternal, 'key' | 'ns' | 'language'>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core",
-  "version": "5.7.3",
+  "version": "5.8.0",
   "description": "Library providing ability to translate messages directly in context of developed application.",
   "main": "./dist/tolgee.cjs.js",
   "module": "./dist/tolgee.esm.js",
@@ -67,5 +67,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "fde08c663fc22333a09c1a6f8e976d16c500e79e"
+  "gitHead": "a6185bf50f9319a81cbd4d768daf56417427d14e"
 }

package/src/Controller/Controller.ts

@@ -195,9 +195,9 @@ export const Controller = ({ options }: StateServiceProps) => {
     return cache.getTranslationNs(namespaces, languages, key);
   }
 
-  function getTranslation({ key, ns }: KeyAndNamespacesInternal) {
+  function getTranslation({ key, ns, language }: KeyAndNamespacesInternal) {
     const namespaces = getDefaultAndFallbackNs(ns || undefined);
-    const languages = state.getFallbackLangs();
+    const languages = state.getFallbackLangs(language);
     return cache.getTranslationFallback(namespaces, languages, key);
   }
 

package/src/TranslateParams.ts

@@ -10,12 +10,14 @@ function parseCombinedOptions({
   noWrap,
   orEmpty,
   params,
+  language,
   ...rest
 }: Partial<TranslateProps>): Partial<TranslateProps> {
   const options: Required<TranslateOptions> = {
     ns: ns!,
     noWrap: noWrap!,
     orEmpty: orEmpty!,
+    language: language!,
   };
   return {
     ...options,

package/src/__test/cache.test.ts

@@ -187,4 +187,17 @@ describe('cache', () => {
     await Promise.resolve();
     expect(tolgee.t('test.sub')).toEqual('en.default');
   });
+
+  it('language prop overrides current language', () => {
+    tolgee = TolgeeCore().init({
+      language: 'en',
+      staticData: {
+        en: { hello: 'Hello' },
+        cs: { hello: 'Ahoj' },
+      },
+    });
+
+    expect(tolgee.t('hello')).toEqual('Hello');
+    expect(tolgee.t('hello', { language: 'cs' })).toEqual('Ahoj');
+  });
 });

package/src/types/general.ts

@@ -22,6 +22,7 @@ export type TranslateOptions = {
   ns?: NsType | null;
   noWrap?: boolean;
   orEmpty?: boolean;
+  language?: string;
 };
 
 export type TranslateProps<
@@ -55,5 +56,5 @@ export type TFnType<
 
 export type KeyAndNamespacesInternal = Pick<
   TranslatePropsInternal,
-  'key' | 'ns'
+  'key' | 'ns' | 'language'
 >;