orc-shared 1.2.0-dev.7 → 1.3.0-dev.2

package/src/utils/setTranslation.js

@@ -3,8 +3,23 @@ import { flatten } from "./flatten";
 /* Replaces a locale string structure with the string for the given locale. */
 const setTranslation = (locale, obj, ...field) => {
 	if (!obj || !obj.getIn(flatten([field]))) return obj;
+	let localeValue = obj.getIn(flatten([field, locale]));
+	if (!localeValue && locale.includes("-")) {
+		let fieldValue = obj.getIn(flatten([field]));
+		let fieldKeys = fieldValue.keys();
+		let language = locale.substring(0, locale.indexOf("-"));
+
+		for (let key of fieldKeys) {
+			if (key !== locale && key.startsWith(language)) {
+				localeValue = obj.getIn(flatten([field, key]));
+				if (localeValue) {
+					break;
+				}
+			}
+		}
+	}
 	const value =
-		obj.getIn(flatten([field, locale])) ||
+		localeValue ||
 		obj
 			.getIn(flatten([field]))
 			.filter(i => i)

package/src/utils/setTranslation.test.js

@@ -96,4 +96,28 @@ describe("setTranslation", () => {
 				hat: { name: "it-name" },
 			}),
 		));
+
+	it("returns first not empty match by language if language-culture not found", () =>
+		expect(
+			setTranslation,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: {
+						name: {
+							"en-CA": "",
+							"fr-CA": "fr CA name",
+							"en-GB": "en GB name",
+							"it-IT": "it-name",
+						},
+					},
+				}),
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en GB name" },
+			}),
+		));
 });

package/src/utils/setTranslationWithFallback.js

@@ -2,7 +2,24 @@ import { flatten } from "./flatten";
 
 export const setTranslationWithFallbackValue = (locale, obj, fallbackValue, ...field) => {
 	if (!obj) return obj;
-	const value = obj.getIn(flatten([field, locale])) || fallbackValue || "";
+	let localeValue = obj.getIn(flatten([field, locale]));
+	if (!localeValue && locale.includes("-")) {
+		let fieldValue = obj.getIn(flatten([field]));
+		if (fieldValue) {
+			let fieldKeys = fieldValue.keys();
+			let language = locale.substring(0, locale.indexOf("-"));
+
+			for (let key of fieldKeys) {
+				if (key !== locale && key.startsWith(language)) {
+					localeValue = obj.getIn(flatten([field, key]));
+					if (localeValue) {
+						break;
+					}
+				}
+			}
+		}
+	}
+	const value = localeValue || fallbackValue || "";
 	return obj.setIn(flatten([field]), value);
 };
 

package/src/utils/setTranslationWithFallback.test.js

@@ -147,4 +147,112 @@ describe("setTranslationWithFallbackValue", () => {
 			"to equal",
 			null,
 		));
+
+	it("returns value matched by language-culture when exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: { name: { "en-US": "en-US Name", "en-GB": "en-GB Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en-US Name" },
+			}),
+		));
+
+	it("returns value matched by language when match by language-culture does not exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: { name: { "en-GB": "en-GB Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en-GB Name" },
+			}),
+		));
+
+	it("returns first not empty value matched by language when match by language-culture does not exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-US",
+				Immutable.fromJS({
+					hat: { name: { "en-GB": "", "en-CA": "en-CA Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "en-CA Name" },
+			}),
+		));
+
+	it("returns value fallback value  when match by language-culture and language does not exist", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-GB",
+				Immutable.fromJS({
+					hat: { name: { "fr-CA": "fr-CA Name" } },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "fallbakValue" },
+			}),
+		));
+
+	it("returns fallbak Value when field value is empty ", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-GB",
+				Immutable.fromJS({
+					hat: { name: {} },
+				}),
+				"fallbakValue",
+				["hat", "name"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: "fallbakValue" },
+			}),
+		));
+
+	it("returns fallbakValue when field is undefined ", () =>
+		expect(
+			setTranslationWithFallbackValue,
+			"when called with",
+			[
+				"en-GB",
+				Immutable.fromJS({
+					hat: { name: {} },
+				}),
+				"fallbakValue",
+				["hat", "name2"],
+			],
+			"to equal",
+			Immutable.fromJS({
+				hat: { name: {}, name2: "fallbakValue" },
+			}),
+		));
 });