Merge branch 'pr/1493' into dev

llaske · Jan 17, 2024 · 13665bc · 13665bc
2 parents f4d659e + fba477f
commit 13665bc
Show file tree

Hide file tree

Showing 22 changed files with 347 additions and 3,248 deletions.
diff --git a/activities/LabyrinthJS.activity/index.html b/activities/LabyrinthJS.activity/index.html
@@ -5,7 +5,6 @@
 <meta charset="utf-8" />
 <title>LabyrinthJS 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" href="css/libnotify.css">

diff --git a/activities/LabyrinthJS.activity/js/activity.js b/activities/LabyrinthJS.activity/js/activity.js
@@ -1,4 +1,4 @@
-define(["sugar-web/activity/activity", "webL10n", "sugar-web/datastore", "sugar-web/graphics/colorpalette", "zoompalette", "sugar-web/graphics/presencepalette", "humane", "fontpalette", "tutorial", "sugar-web/env"], function (activity, webL10n, datastore, colorpalette, zoompalette, presencepalette, humane, textpalette, tutorial, env, l10n) {
+define(["sugar-web/activity/activity", "l10n", "sugar-web/datastore", "sugar-web/graphics/colorpalette", "zoompalette", "sugar-web/graphics/presencepalette", "humane", "fontpalette", "tutorial", "sugar-web/env"], function (activity, l10n, datastore, colorpalette, zoompalette, presencepalette, humane, textpalette, tutorial, env) {
 	var defaultColor = '#FFF29F';
 	var isShared = false;
 	var isHost = false;
@@ -67,7 +67,7 @@ define(["sugar-web/activity/activity", "webL10n", "sugar-web/datastore", "sugar-
 				file_size: 0
 			};
 			datastore.create(metadata, function() {
-				humane.log(webL10n.get('LabyrinthImage'));
+				humane.log(l10n.get('LabyrinthImage'));
 				console.log("export done.")
 			}, inputData);
 		});
@@ -248,43 +248,43 @@ define(["sugar-web/activity/activity", "webL10n", "sugar-web/datastore", "sugar-
 		});
 
 		// Handle localization
-		window.addEventListener('localized', function() {
-			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;
-				if (webL10n.language.code != language) {
-					webL10n.language.code = language;
-				};
-				var oldDefaultText = defaultText;
-				defaultText = webL10n.get("YourNewIdea");
-				nodetextButton.title = webL10n.get("nodetextTitle");
-				linkButton.title = webL10n.get("linkButtonTitle");
-				removeButton.title = webL10n.get("removeButtonTitle");
-				undoButton.title = webL10n.get("undoButtonTitle");
-				redoButton.title = webL10n.get("redoButtonTitle");
-				zoomButton.title = webL10n.get("zoomButtonTitle");
-				foregroundButton.title = webL10n.get("foregroundButtonTitle");
-				backgroundButton.title = webL10n.get("backgroundButtonTitle");
-				textValue.placeholder = webL10n.get("typeText");
-				boldButton.title = webL10n.get("boldButtonTitle");
-				italicButton.title = webL10n.get("italicButtonTitle");
-				fontMinusButton.title = webL10n.get("fontMinusButtonTitle");
-				fontPlusButton.title = webL10n.get("fontPlusButtonTitle");
-				fontButton.title = webL10n.get("fontButtonTitle");
-				pngButton.title = webL10n.get("pngButtonTitle");
-				if (cy) {
-					var nodes = cy.elements("node");
-					for(var i = 0; i < nodes.length ; i++) {
-						var node = nodes[i];
-						if (node.data('content') == oldDefaultText) {
-							node.data('content', defaultText);
-							node.style({'content': defaultText});
-						}
+		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;
+			if (l10n.language.code != language) {
+				l10n.init(language);
+			};
+		});
+		window.addEventListener("localized", function() {
+			var oldDefaultText = defaultText;
+			defaultText = l10n.get("YourNewIdea");
+			nodetextButton.title = l10n.get("nodetextTitle");
+			linkButton.title = l10n.get("linkButtonTitle");
+			removeButton.title = l10n.get("removeButtonTitle");
+			undoButton.title = l10n.get("undoButtonTitle");
+			redoButton.title = l10n.get("redoButtonTitle");
+			zoomButton.title = l10n.get("zoomButtonTitle");
+			foregroundButton.title = l10n.get("foregroundButtonTitle");
+			backgroundButton.title = l10n.get("backgroundButtonTitle");
+			textValue.placeholder = l10n.get("typeText");
+			boldButton.title = l10n.get("boldButtonTitle");
+			italicButton.title = l10n.get("italicButtonTitle");
+			fontMinusButton.title = l10n.get("fontMinusButtonTitle");
+			fontPlusButton.title = l10n.get("fontPlusButtonTitle");
+			fontButton.title = l10n.get("fontButtonTitle");
+			pngButton.title = l10n.get("pngButtonTitle");
+
+			if (cy) {
+				var nodes = cy.elements("node");
+				for(var i = 0; i < nodes.length ; i++) {
+					var node = nodes[i];
+					if (node.data('content') == oldDefaultText) {
+						node.data('content', defaultText);
+						node.style({'content': defaultText});
 					}
 				}
-			});
-		}, false);
-
+			}
+		});
 		// --- Cytoscape handling
 
 		// Initialize board
@@ -814,15 +814,15 @@ define(["sugar-web/activity/activity", "webL10n", "sugar-web/datastore", "sugar-
 			var userName = msg.user.name.replace('<', '&lt;').replace('>', '&gt;');
 			var html = "<img style='height:30px;' src='" + generateXOLogoWithColor(msg.user.colorvalue) + "'>";
 			if (msg.move === 1) {
-				humane.log(html + webL10n.get("PlayerJoin",{user: userName}));
+				humane.log(html + l10n.get("PlayerJoin",{user: userName}));
 				if (isHost) {
 					sendMessage({
 						action: 'initialBoard',
 						data: getGraph()
 					});
 				}
 			} else if (msg.move === -1) {
-				humane.log(html + webL10n.get("PlayerLeave",{user: userName}));
+				humane.log(html + l10n.get("PlayerLeave",{user: userName}));
 			}
 			network.listSharedActivities(function(activities) {
 				for (var i = 0; i < activities.length; i++) {

diff --git a/activities/LabyrinthJS.activity/js/loader.js b/activities/LabyrinthJS.activity/js/loader.js
@@ -9,6 +9,6 @@ requirejs.config({
 
 requirejs(["activity/activity"]);
 
-requirejs(["webL10n","sugar-web/env","sugar-web/datastore"], function(l10n, env,datastore) {
+requirejs(["l10n","sugar-web/env","sugar-web/datastore"], function(l10n, env,datastore) {
 	l10n_s = l10n;
 });