Merge branch 'pr/1401' into dev

llaske · Oct 1, 2023 · fb8c8ab · fb8c8ab
2 parents 089c88b + 8594e0c
commit fb8c8ab
Show file tree

Hide file tree

Showing 22 changed files with 285 additions and 2,833 deletions.
diff --git a/activities/Fototoon.activity/index.html b/activities/Fototoon.activity/index.html
@@ -11,7 +11,6 @@
           href="lib/sugar-web/graphics/css/sugar-200dpi.css">
     <link rel="stylesheet" href="css/activity.css">
     <link rel="stylesheet" href="css/libnotify.css">
-	<link rel="prefetch" type="application/l10n" href="localization.ini">
 
     <link rel="stylesheet" href="css/introjs.css">
     <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>

diff --git a/activities/Fototoon.activity/js/activity.js b/activities/Fototoon.activity/js/activity.js
@@ -1,4 +1,4 @@
-define(["sugar-web/activity/activity","sugar-web/datastore","sugar-web/env","textpalette","sugar-web/graphics/menupalette","sugar-web/graphics/journalchooser","lzstring","webL10n","toon","tutorial", "picoModal"], function (activity, datastore, env, textpalette, menupalette, journalchooser, lzstring, l10n, toon, tutorial, picoModal) {
+define(["sugar-web/activity/activity","sugar-web/datastore","sugar-web/env","textpalette","sugar-web/graphics/menupalette","sugar-web/graphics/journalchooser","lzstring","l10n","toon","tutorial", "picoModal"], function (activity, datastore, env, textpalette, menupalette, journalchooser, lzstring, l10n, toon, tutorial, picoModal) {
 
 
     // initialize canvas size
@@ -9,7 +9,7 @@ define(["sugar-web/activity/activity","sugar-web/datastore","sugar-web/env","tex
 	env.getEnvironment(function(err, environment) {
 		var defaultLanguage = (typeof chrome != 'undefined' && chrome.app && chrome.app.runtime) ? chrome.i18n.getUILanguage() : navigator.language;
         	language = environment.user ? environment.user.language : defaultLanguage;
-		l10n.language.code = language;
+		l10n.init(language);
 		console.log('LANG ' + language);
 	});
 
@@ -271,7 +271,7 @@ define(["sugar-web/activity/activity","sugar-web/datastore","sugar-web/env","tex
 
         // Launch tutorial
 	    document.getElementById("help-button").addEventListener('click', function(e) {
-            l10n.language.code=language;
+            l10n.init(language);
             var once=1;
             window.addEventListener("localized", function() {
                 if (once) {

diff --git a/activities/Fototoon.activity/js/toon.js b/activities/Fototoon.activity/js/toon.js
@@ -1,10 +1,10 @@
-define(["easel","sugar-web/datastore","sugar-web/env","webL10n","humane"], function (easel, datastore, env, l10n, humane) {
+define(["easel","sugar-web/datastore","sugar-web/env","l10n","humane"], function (easel, datastore, env, l10n, humane) {
 
 
 	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.language.code = language;
+		l10n.init(language);
 		console.log('LANG ' + language);
 	});
 

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

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

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

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