Merge branch 'pr/1480' into dev

llaske · Jan 11, 2024 · 1969077 · 1969077
2 parents 8c74992 + 6727d74
commit 1969077
Show file tree

Hide file tree

Showing 20 changed files with 233 additions and 2,228 deletions.
diff --git a/activities/Memorize.activity/index.html b/activities/Memorize.activity/index.html
@@ -6,7 +6,6 @@
     <title>Memorize 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/Memorize.activity/js/activity.js b/activities/Memorize.activity/js/activity.js
@@ -1,6 +1,6 @@
 /* Start of the app, we require everything that is needed */
 define(function (require) {
-    requirejs(['domReady!', "sugar-web/activity/activity", "sugar-web/graphics/presencepalette", 'sugar-web/env', 'webL10n', 'activity/memorize-app'], function (doc, activity, presencePalette, env, webL10n, memorizeApp) {
+    requirejs(['domReady!', "sugar-web/activity/activity", "sugar-web/graphics/presencepalette", 'sugar-web/env', "l10n", 'activity/memorize-app'], function (doc, activity, presencePalette, env, l10n, memorizeApp) {
 
         window.memorizeApp = memorizeApp;
         memorizeApp.activity = activity;
@@ -9,13 +9,9 @@ define(function (require) {
         env.getEnvironment(function(err, environment) {
             var defaultLanguage = (typeof chrome != 'undefined' && chrome.app && chrome.app.runtime) ? chrome.i18n.getUILanguage() : navigator.language;
             var language = environment.user ? environment.user.language : defaultLanguage;
+            l10n.init(language);
             window.addEventListener('localized', function(e) {
-                document.getElementById("network-button").title = webL10n.get("TutoTitleNetwork");
-                if (e.language != language) {
-                    setTimeout(function() {
-                      webL10n.language.code = language;
-                    }, 50);
-                }
+                document.getElementById("network-button").title = l10n.get("TutoTitleNetwork");    
             });
         });
 
@@ -97,11 +93,11 @@ define(function (require) {
             var html = "<img style='height:30px;vertical-align:middle;' src='" + generateXOLogoWithColor(msg.user.colorvalue) + "'>";
 
             if (msg.move === 1) {
-                showQuickModal(html + webL10n.get("PlayerJoin",{user: userName}))
+                showQuickModal(html + l10n.get("PlayerJoin",{user: userName}))
             }
 
             if (msg.move === -1) {
-                showQuickModal(html + webL10n.get("PlayerLeave",{user: userName}))
+                showQuickModal(html + l10n.get("PlayerLeave",{user: userName}))
             }
 
             memorizeApp.presence.listUsers(function (users) {

diff --git a/activities/Memorize.activity/lib/axios.min.js b/activities/Memorize.activity/lib/axios.min.js
diff --git a/activities/Memorize.activity/lib/i18next.min.js b/activities/Memorize.activity/lib/i18next.min.js
diff --git a/activities/Memorize.activity/lib/l10n.js b/activities/Memorize.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/Memorize.activity/lib/sugar-web/activity/activity.js b/activities/Memorize.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/Memorize.activity/lib/sugar-web/package.json b/activities/Memorize.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/Memorize.activity/lib/sugar-web/test/loader.js b/activities/Memorize.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/Memorize.activity/lib/tutorial.js b/activities/Memorize.activity/lib/tutorial.js
@@ -1,4 +1,4 @@
-define(["webL10n"], function (l10n) {
+define(["l10n"], function (l10n) {
 	var tutorial = {};
 
 	tutorial.startMainTutorial = function(boardType) {