Merge branch 'pr/1385' into dev

llaske · Aug 19, 2023 · 79ee04c · 79ee04c
2 parents 41f07bb + 2cc6514
commit 79ee04c
Show file tree

Hide file tree

Showing 20 changed files with 145 additions and 1,635 deletions.
diff --git a/activities/Blockrain.activity/index.html b/activities/Blockrain.activity/index.html
@@ -5,7 +5,7 @@
 <meta charset="utf-8" />
 <title>Blockrain 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/Blockrain.activity/js/activity.js b/activities/Blockrain.activity/js/activity.js
@@ -1,4 +1,4 @@
-define(["sugar-web/activity/activity","sugar-web/env", "webL10n", "tutorial"], function (activity,env, webL10n, tutorial) {
+define(["sugar-web/activity/activity","sugar-web/env", "l10n", "tutorial"], function (activity,env, l10n, tutorial) {
 
 	// Manipulate the DOM only when it is ready.
 	requirejs(['domReady!'], function (doc) {
@@ -8,7 +8,7 @@ define(["sugar-web/activity/activity","sugar-web/env", "webL10n", "tutorial"], f
 		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;
-			webL10n.language.code = language;
+			l10n.init(language);
 		});
 		var myHighestScore = 0;
 

diff --git a/activities/Blockrain.activity/lib/axios.min.js b/activities/Blockrain.activity/lib/axios.min.js
diff --git a/activities/Blockrain.activity/lib/i18next.min.js b/activities/Blockrain.activity/lib/i18next.min.js
diff --git a/activities/Blockrain.activity/lib/l10n.js b/activities/Blockrain.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/Blockrain.activity/lib/sugar-web/activity/activity.js b/activities/Blockrain.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/Blockrain.activity/lib/sugar-web/package.json b/activities/Blockrain.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/Blockrain.activity/lib/sugar-web/test/loader.js b/activities/Blockrain.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)
@@ -19,3 +19,4 @@ requirejs.config({
     // start test run, once Require.js is done
     callback: window.__karma__.start
 });
+
diff --git a/activities/Blockrain.activity/lib/tutorial.js b/activities/Blockrain.activity/lib/tutorial.js
@@ -1,4 +1,4 @@
-define(["webL10n"], function (l10n) {
+define(["l10n"], function (l10n) {
 	var tutorial = {};
 	tutorial.start = function() {
 		var steps = [
@@ -60,4 +60,4 @@ define(["webL10n"], function (l10n) {
 	};
 
 	return tutorial;
-});
+});