@osano/osano-cmp-react-native 0.17.1 → 0.17.3

package/src/utils/Translator.ts

@@ -272,7 +272,7 @@ export default class Translator extends EventEmitter {
 	}
 
 	/**
-	 * Translates a particular LocalizedString path
+	 * Translates a particular LocalizedString path with mobile/web priority system
 	 */
 	translate(
 		path: string | string[],
@@ -281,29 +281,52 @@ export default class Translator extends EventEmitter {
 	): string | LocalizedStrings {
 		const localePassed = typeof props === 'string';
 		const locale = localePassed ? props : props.locale || this.locale;
-		const fallback =
-			typeof defaultPhrase === 'string' ? defaultPhrase : `${path}`;
+		const pathStr = Array.isArray(path) ? path.join('.') : path;
+		const fallback = typeof defaultPhrase === 'string' ? defaultPhrase : `${pathStr}`;
 		const phrases = locales[`${locale}`];
 		const override = this._overrides[`${locale}`];
-		// Always request from override first
-		let translation =
-			(override && get(this._overrides, path)) ||
-			get(phrases, path) ||
-			(locale.length > 2
-				? this.translate(path, locale.slice(0, 2), fallback)
-				: typeof defaultPhrase === 'string'
-					? this.translate(fallback, locale)
-					: fallback);
-
-		const { interpolations = {} } = localePassed ? {} : props;
-		Object.entries(interpolations).forEach(([key, value]) => {
-			const pattern = new RegExp(`%{${key}}`, 'g');
-			if (typeof translation === 'string') {
-				translation = translation.replace(pattern, value);
+		
+		let translation: string | number | LocalizedStrings | undefined;
+		
+		// Priority-based translation lookup
+		const searchPaths = [
+			// Mobile Customer-specific
+			[override ,`mobile.${pathStr}`],
+			// Web Customer-specific
+			[override, pathStr],
+			// Mobile Global
+			[phrases, `mobile.${pathStr}`],
+			// Web Global
+			[phrases, pathStr],
+		] as [Record<string, string> ,string][];
+		// Search in customer-specific overrides first, then global phrases
+		for (const [source, searchPath] of searchPaths) {
+			if (source) {
+				translation = get(source, searchPath);
+				if (translation) break;
 			}
-		});
-
-		return translation;
+		}
+		// Base translatedResourceBundle (fallback to default locale)
+		if (translation == null && locale !== Translator.DEFAULT_LANGUAGE) {
+			const defaultPhrases = locales[Translator.DEFAULT_LANGUAGE];
+			if (defaultPhrases) {
+				translation = get(defaultPhrases, `mobile.${pathStr}`, get(defaultPhrases, pathStr));
+			}
+		}
+		// Use fallback if nothing found
+		if (!translation) {
+			translation = fallback;
+		}
+		// Apply interpolations if needed
+		const { interpolations = {} } = localePassed ? {} : props;
+		if (typeof translation === 'string' && Object.keys(interpolations).length > 0) {
+			Object.entries(interpolations).forEach(([key, value]) => {
+				const pattern = new RegExp(`%{${key}}`, 'g');
+				translation = (translation as string).replace(pattern, value);
+			});
+		}
+		// Convert number to string if needed for consistency
+		return `${translation}`;
 	}
 
 	/**