Merge branch 'pr/1525' into dev

llaske · Feb 16, 2024 · 7263b0d · 7263b0d
2 parents 5cb6b44 + c206340
commit 7263b0d
Show file tree

Hide file tree

Showing 23 changed files with 684 additions and 5,141 deletions.
diff --git a/activities/FoodChain.activity/index.html b/activities/FoodChain.activity/index.html
@@ -3,7 +3,6 @@
 <head>
 	<title>Food Chain Activity</title>
 	<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, viewport-fit=cover"/>
-    <link rel="prefetch" type="application/l10n" href="locale.ini" />
 	<link rel="stylesheet" media="not screen and (device-width: 1200px) and (device-height: 900px)"
 	href="lib/sugar-web/graphics/css/sugar-96dpi.css">
 	<link rel="stylesheet" media="screen and (device-width: 1200px) and (device-height: 900px)"

diff --git a/activities/FoodChain.activity/js/activity.js b/activities/FoodChain.activity/js/activity.js
@@ -1,8 +1,8 @@
 
 
-define(["sugar-web/activity/activity","webL10n","sugar-web/graphics/radiobuttonsgroup","sugar-web/datastore","tutorial", "sugar-web/env"], function (activity, _l10n, radioButtonsGroup, datastore, tutorial, env) {
-	l10n = _l10n;
+define(["sugar-web/activity/activity","l10n","sugar-web/graphics/radiobuttonsgroup","sugar-web/datastore","tutorial", "sugar-web/env"], function (activity, _l10n, radioButtonsGroup, datastore, tutorial, env) {
 	var app = null;
+	l10n = _l10n
 
     // Manipulate the DOM only when it is ready.
     requirejs(['domReady!'], function (doc) {
@@ -16,14 +16,17 @@ define(["sugar-web/activity/activity","webL10n","sugar-web/graphics/radiobuttons
 			document.getElementById("fr-button")]
 		);
 		document.getElementById("en-button").onclick = function() {
+			l10n.init("en");
 			l10n.language.code = "en";
 			FoodChain.setLocale();
 		};
 		document.getElementById("fr-button").onclick = function() {
+			l10n.init("fr");
 			l10n.language.code = "fr";
 			FoodChain.setLocale();
 		};
 		document.getElementById("pt_BR-button").onclick = function() {
+			l10n.init("pt_BR");
 			l10n.language.code = "pt_BR";
 			FoodChain.setLocale();
 		};
@@ -42,8 +45,10 @@ define(["sugar-web/activity/activity","webL10n","sugar-web/graphics/radiobuttons
 					var language = environment.user ? environment.user.language : defaultLanguage;
 					if (language == 'fr' || language == 'en') {
 						l10n.language.code = language;
+						l10n.init(language);
 					} else if (language == 'pt') {
 						l10n.language.code = "pt_BR";
+						l10n.init("pt_BR");
 					}
 
 					// Init sound component
@@ -71,6 +76,7 @@ define(["sugar-web/activity/activity","webL10n","sugar-web/graphics/radiobuttons
 				FoodChain.setLocale();
 			}
 		};
+		localized_received(); //invoke to init the app
 		window.addEventListener('localized', localized_received, false);
 
         // Stop sound at end of game to sanitize media environment, specifically on Android

diff --git a/activities/FoodChain.activity/l10n.js b/activities/FoodChain.activity/l10n.js
@@ -1,6 +1,6 @@
 // Localization API
 
- var l10n;
+ var l10n; //loaded by activity.js
 
 
 // Localization function

diff --git a/activities/FoodChain.activity/lib/axios.min.js b/activities/FoodChain.activity/lib/axios.min.js
diff --git a/activities/FoodChain.activity/lib/i18next.min.js b/activities/FoodChain.activity/lib/i18next.min.js
diff --git a/activities/FoodChain.activity/lib/l10n.js b/activities/FoodChain.activity/lib/l10n.js
@@ -0,0 +1,55 @@
+define(['i18next.min', 'axios.min'], function (i18next, axios) {
+    const l10n = {language: {direction: "ltr"}};
+
+    l10n.init = async (lang) => {
+        await i18next.init({
+            lng: lang,
+            fallbackLng: "en",
+            resources: {}
+        }).then(() => {
+            l10n.language.direction = i18next.dir();
+            l10n.switchTo(lang);
+        });
+    };
+
+    l10n.get = (key, parameter) => {
+        return i18next.t(key, parameter);
+    };
+
+    l10n.loadLanguageResource = (lang) => {
+        return new Promise((resolve, reject) => {
+            axios.get("./locales/" + lang + ".json").then((response) => {
+                resolve(response.data);
+            }).catch((error) => {
+                console.log("Failed to load " + lang + " language: " + error);
+                resolve(null); // Resolve with null to indicate failure
+            });
+        });
+    };
+
+    l10n.switchTo = (lang) => {
+        if (!i18next.hasResourceBundle(lang, "translation")) {
+            console.log("Loading " + lang + " language");
+            l10n.loadLanguageResource(lang).then((locales) => {
+                if (locales !== null) {
+                    i18next.addResourceBundle(lang, "translation", locales);
+                    i18next.changeLanguage(lang);
+                    triggerLocalizedEvent();
+                } else {
+                    l10n.init("en");
+                }
+            });
+        } else {
+            i18next.changeLanguage(lang);
+            triggerLocalizedEvent();
+        }
+    };
+
+
+    function triggerLocalizedEvent() {
+        const event = new Event("localized");
+        window.dispatchEvent(event);
+    };
+
+    return l10n;
+});