Merge branch 'pr/1486' into dev

llaske · Jan 16, 2024 · 74c9875 · 74c9875
2 parents bfc6366 + 4010873
commit 74c9875
Show file tree

Hide file tree

Showing 20 changed files with 149 additions and 1,694 deletions.
diff --git a/activities/Reflection.activity/index.html b/activities/Reflection.activity/index.html
@@ -11,7 +11,6 @@
   	href="lib/sugar-web/graphics/css/sugar-200dpi.css">
   <link rel="stylesheet" href="css/activity.css">
   <link href="https://fonts.googleapis.com/css?family=Crimson+Text|Open+Sans|Cutive+Mono" rel="stylesheet">
-  <link rel="prefetch" type="application/l10n" href="locale.ini">
   <link rel="stylesheet" href="./css/introjs.css">
 	<script src="./lib/intro.js"></script>
   <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>

diff --git a/activities/Reflection.activity/js/activity.js b/activities/Reflection.activity/js/activity.js
@@ -4,15 +4,15 @@ define(["sugar-web/activity/activity", 'easeljs', 'tweenjs', 'activity/game', 'a
 	requirejs(['domReady!'], function (doc) {
 
 		// Initialize the activity.
-		requirejs(["sugar-web/env", "sugar-web/datastore", "tutorial", "webL10n"], function (env, datastore, tutorial, webL10n) {
+		requirejs(["sugar-web/env", "sugar-web/datastore", "tutorial", "l10n"], function (env, datastore, tutorial, l10n) {
 			act.setup();
 			env.getEnvironment(function (err, environment) {
 				currentenv = environment;
 
 				// Set current language to Sugarizer
 				var defaultLanguage = (typeof chrome != 'undefined' && chrome.app && chrome.app.runtime) ? chrome.i18n.getUILanguage() : navigator.language;
 				var language = environment.user ? environment.user.language : defaultLanguage;
-				webL10n.language.code = language;
+				l10n.init(language);
 			});
 			act.getXOColor(function (error, colors) {
 				runactivity(act, doc, colors, env, datastore, tutorial);

diff --git a/activities/Reflection.activity/lib/axios.min.js b/activities/Reflection.activity/lib/axios.min.js
diff --git a/activities/Reflection.activity/lib/i18next.min.js b/activities/Reflection.activity/lib/i18next.min.js
diff --git a/activities/Reflection.activity/lib/l10n.js b/activities/Reflection.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;
+});
diff --git a/activities/Reflection.activity/lib/sugar-web/activity/activity.js b/activities/Reflection.activity/lib/sugar-web/activity/activity.js
@@ -1,12 +1,11 @@
-define(["webL10n",
-        "sugar-web/activity/shortcut",
+define(["sugar-web/activity/shortcut",
         "sugar-web/bus",
         "sugar-web/env",
         "sugar-web/datastore",
 		"sugar-web/presence",
         "sugar-web/graphics/icon",
         "sugar-web/graphics/activitypalette"], function (
-    l10n, shortcut, bus, env, datastore, presence, icon, activitypalette) {
+    shortcut, bus, env, datastore, presence, icon, activitypalette) {
 
     'use strict';
 
@@ -22,7 +21,6 @@ define(["webL10n",
     activity.setup = function () {
         bus.listen();
 
-        l10n.start();
 
         function sendPauseEvent() {
 			var pauseEvent = document.createEvent("CustomEvent");

diff --git a/activities/Reflection.activity/lib/sugar-web/package.json b/activities/Reflection.activity/lib/sugar-web/package.json
@@ -2,7 +2,6 @@
   "volo": {
     "baseUrl": "lib",
     "dependencies": {
-      "webL10n": "github:sugarlabs/webL10n",
       "mustache": "github:janl/mustache.js/0.7.2",
       "text": "github:requirejs/text"
     }

diff --git a/activities/Reflection.activity/lib/sugar-web/test/loader.js b/activities/Reflection.activity/lib/sugar-web/test/loader.js
@@ -9,8 +9,7 @@ requirejs.config({
     paths: {
         "sugar-web": ".",
         "mustache": "lib/mustache",
-        "text": "lib/text",
-        "webL10n": "lib/webL10n"
+        "text": "lib/text"
     },
 
     // ask Require.js to load these files (all our tests)

diff --git a/activities/Reflection.activity/lib/tutorial.js b/activities/Reflection.activity/lib/tutorial.js
@@ -1,4 +1,4 @@
-define(["webL10n"], function (l10n) {
+define(["l10n"], function (l10n) {
   var tutorial = {};
 
   tutorial.start = function () {