Merge branch 'pr/1530' into dev

llaske · Feb 20, 2024 · cf16741 · cf16741
2 parents a1f6341 + fe37fb1
commit cf16741
Show file tree

Hide file tree

Showing 20 changed files with 4,063 additions and 1,749 deletions.
diff --git a/activities/Calligra.activity/index.html b/activities/Calligra.activity/index.html
@@ -5,7 +5,6 @@
 <meta charset="utf-8" />
 <title>Calligra 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/Calligra.activity/js/activity.js b/activities/Calligra.activity/js/activity.js
@@ -108,7 +108,7 @@ var app = new Vue({
 						images.push({text: user});
 					}
 					for (let i = 0 ; i < 15 ; i++) {
-						images.push({text: app.$refs.localization.get("Word"+i)});
+						images.push({text: window.l10n.get("Word"+i)});
 					}
 					defaultTemplates[2].images = images;
 				});
@@ -275,7 +275,7 @@ var app = new Vue({
 		onInsertText: function() {
 			var vm = this;
 			vm.showTypeTextPopup(
-				vm.$refs.localization.get("TextDefault"),
+				window.l10n.get("TextDefault"),
 				function(text) {
 					if (text && text.length) {
 						vm.currentTemplate.images.push({text: text});
@@ -359,9 +359,9 @@ var app = new Vue({
 
 		// Handle type text popup
 		showTypeTextPopup: function(defaultText, callback) {
-			var titleOk = this.$refs.localization.get("Ok"),
-				titleCancel = this.$refs.localization.get("Cancel"),
-				titleSettings = this.$refs.localization.get("TextTitle");
+			var titleOk =  window.l10n.get("Ok"),
+				titleCancel =  window.l10n.get("Cancel"),
+				titleSettings =  window.l10n.get("TextTitle");
 			this.$refs.inserttextpopup.show({
 				data: {
 					defaultText: defaultText,

diff --git a/activities/Calligra.activity/js/l10n.js b/activities/Calligra.activity/js/l10n.js
@@ -14,12 +14,12 @@ var Localization = {
 	mounted: function() {
 		var vm = this;
 		if (vm.l10n == null) {
-			requirejs(["sugar-web/env", "webL10n"], function (env, webL10n) {
+			requirejs(["sugar-web/env", "l10n"], function (env, l10n) {
 				env.getEnvironment(function(err, environment) {
-					vm.l10n = webL10n;
+					vm.l10n = l10n;
 					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);
 					window.addEventListener("localized", function() {
 						if (!vm.eventReceived) {
 							vm.code = language;

diff --git a/activities/Calligra.activity/js/tutorial.js b/activities/Calligra.activity/js/tutorial.js
@@ -1,57 +1,10 @@
-
 // Tutorial component based on bootstrap tour
 var Tutorial = {
 	template: '<div/>',
-	data: function() {
-		return {
-			l10n: {
-				stringPrevShort: '',
-				stringNextShort: '',
-				stringEndShort: '',
-				stringTutoExplainTitle: '',
-				stringTutoExplainContent: '',
-				stringTutoFullscreenButtonTitle: '',
-				stringTutoFullscreenButtonContent: '',
-				stringTutoEditorItemTitle: '',
-				stringTutoEditorItemContent: '',
-				stringTutoPlayerItemTitle: '',
-				stringTutoPlayerItemContent: '',
-				stringTutoInsertImageButtonTitle: '',
-				stringTutoInsertImageButtonContent: '',
-				stringTutoEditorTemplateButtonTitle: '',
-				stringTutoEditorTemplateButtonContent: '',
-				stringTutoPlayerTemplateButtonTitle: '',
-				stringTutoPlayerTemplateButtonContent: '',
-				stringTutoEditorItemButtonTitle: '',
-				stringTutoEditorItemButtonContent: '',
-				stringTutoPlayerItemButtonTitle: '',
-				stringTutoPlayerItemButtonContent: '',
-				stringTutoLinesButtonTitle: '',
-				stringTutoLinesButtonContent: '',
-				stringTutoZoomButtonTitle: '',
-				stringTutoZoomButtonContent: '',
-				stringTutoBackButtonTitle: '',
-				stringTutoBackButtonContent: '',
-				stringTutoRestartButtonTitle: '',
-				stringTutoRestartButtonContent: '',
-				stringTutoNextButtonTitle: '',
-				stringTutoNextButtonContent: '',
-				stringTutoEditorAddButtonTitle: '',
-				stringTutoEditorAddButtonContent: '',
-				stringTutoEditorRemoveButtonTitle: '',
-				stringTutoEditorRemoveButtonContent: '',
-				stringTutoEditorAddPathButtonTitle: '',
-				stringTutoEditorAddPathButtonContent: '',
-				stringTutoEditorRemovePathButtonTitle: '',
-				stringTutoEditorRemovePathButtonContent: '',
-				stringTutoTemplateButtonTitle: '',
-				stringTutoTemplateButtonContent: ''
-			}
-		}
-	},
+
 	methods: {
 		localized: function(localization) {
-			localization.localize(this.l10n);
+			// Update the tutorial
 		},
 
 		show: function(options) {
@@ -60,105 +13,105 @@ var Tutorial = {
 			if (options.currentView === TemplateViewer && !options.editMode) {
 				steps.push(
 					{
-						title: this.l10n.stringTutoExplainTitle,
-						intro: this.l10n.stringTutoExplainContent
+						title: window.l10n.get("TutoExplainTitle"),
+						intro: window.l10n.get("TutoExplainContent")
 					}
 				);
 			}
 			steps = steps.concat([
 				{
 					element: options.templatebutton,
 					position: "bottom",
-					title: this.l10n.stringTutoTemplateButtonTitle,
-					intro: this.l10n.stringTutoTemplateButtonContent
+					title: window.l10n.get("TutoTemplateButtonTitle"),
+					intro: window.l10n.get("TutoTemplateButtonContent")
 				},
 				{
 					element: options.item,
 					position: "right",
-					title: options.editMode?this.l10n.stringTutoEditorItemTitle:this.l10n.stringTutoPlayerItemTitle,
-					intro: options.editMode?this.l10n.stringTutoEditorItemContent:this.l10n.stringTutoPlayerItemContent
+					title: options.editMode ? window.l10n.get("TutoEditorItemTitle") : window.l10n.get("TutoPlayerItemTitle"),
+					intro: options.editMode ? window.l10n.get("TutoEditorItemContent") : window.l10n.get("TutoPlayerItemContent")
 				}
 			]);
 			if (options.currentView === TemplateViewer && options.editMode) {
 				steps.push(
 					{
 						element: options.insertimagebutton,
 						position: "bottom",
-						title: this.l10n.stringTutoInsertImageButtonTitle,
-						intro: this.l10n.stringTutoInsertImageButtonContent
+						title: window.l10n.get("TutoInsertImageButtonTitle"),
+						intro: window.l10n.get("TutoInsertImageButtonContent")
 					}
 				);
 			}
-			var settingsItemName = "stringTuto"+(options.editMode?"Player":"Editor")+(options.currentView === TemplateViewer?"Template":"Item")+"Button";
+			var settingsItemName = "stringTuto" + (options.editMode ? "Player" : "Editor") + (options.currentView === TemplateViewer ? "Template" : "Item") + "Button";
 			steps = steps.concat([
 				{
 					element: options.settingsbutton,
 					position: "bottom",
-					title: this.l10n[settingsItemName+"Title"],
-					intro: this.l10n[settingsItemName+"Content"]
+					title: window.l10n.get("TutoEditorTemplateButtonTitle"),
+					intro: window.l10n.get("TutoEditorTemplateButtonContent")
 				},
 				{
 					element: options.fullscreenbutton,
 					position: "bottom",
-					title: this.l10n.stringTutoFullscreenButtonTitle,
-					intro: this.l10n.stringTutoFullscreenButtonContent
+					title: window.l10n.get("TutoFullscreenButtonTitle"),
+					intro: window.l10n.get("TutoFullscreenButtonContent")
 				}
 			]);
 			if (options.currentView !== TemplateViewer) {
 				steps = steps.concat([
 					{
 						element: options.linesbutton,
 						position: "bottom",
-						title: this.l10n.stringTutoLinesButtonTitle,
-						intro: this.l10n.stringTutoLinesButtonContent
+						title: window.l10n.get("TutoLinesButtonTitle"),
+						intro: window.l10n.get("TutoLinesButtonContent")
 					},
 					{
 						element: options.zoombutton,
 						position: "bottom",
-						title: this.l10n.stringTutoZoomButtonTitle,
-						intro: this.l10n.stringTutoZoomButtonContent
+						title: window.l10n.get("TutoZoomButtonTitle"),
+						intro: window.l10n.get("TutoZoomButtonContent")
 					},
 					{
 						element: options.backbutton,
 						position: "right",
-						title: this.l10n.stringTutoBackButtonTitle,
-						intro: this.l10n.stringTutoBackButtonContent
+						title: window.l10n.get("TutoBackButtonTitle"),
+						intro: window.l10n.get("TutoBackButtonContent")
 					},
 					{
 						element: options.editoraddbutton,
 						position: "left",
-						title: this.l10n.stringTutoEditorAddButtonTitle,
-						intro: this.l10n.stringTutoEditorAddButtonContent
+						title: window.l10n.get("TutoEditorAddButtonTitle"),
+						intro: window.l10n.get("TutoEditorAddButtonContent")
 					},
 					{
 						element: options.editorremovebutton,
 						position: "left",
-						title: this.l10n.stringTutoEditorRemoveButtonTitle,
-						intro: this.l10n.stringTutoEditorRemoveButtonContent
+						title: window.l10n.get("TutoEditorRemoveButtonTitle"),
+						intro: window.l10n.get("TutoEditorRemoveButtonContent")
 					},
 					{
 						element: options.editoraddpathbutton,
 						position: "left",
-						title: this.l10n.stringTutoEditorAddPathButtonTitle,
-						intro: this.l10n.stringTutoEditorAddPathButtonContent
+						title: window.l10n.get("TutoEditorAddPathButtonTitle"),
+						intro: window.l10n.get("TutoEditorAddPathButtonContent")
 					},
 					{
 						element: options.editorremovepathbutton,
 						position: "left",
-						title: this.l10n.stringTutoEditorRemovePathButtonTitle,
-						intro: this.l10n.stringTutoEditorRemovePathButtonContent
+						title: window.l10n.get("TutoEditorRemovePathButtonTitle"),
+						intro: window.l10n.get("TutoEditorRemovePathButtonContent")
 					},
 					{
 						element: options.restartbutton,
 						position: "left",
-						title: this.l10n.stringTutoRestartButtonTitle,
-						intro: this.l10n.stringTutoRestartButtonContent
+						title: window.l10n.get("TutoRestartButtonTitle"),
+						intro: window.l10n.get("TutoRestartButtonContent")
 					},
 					{
 						element: options.nextbutton,
 						position: "left",
-						title: this.l10n.stringTutoNextButtonTitle,
-						intro: this.l10n.stringTutoNextButtonContent
+						title: window.l10n.get("TutoNextButtonTitle"),
+						intro: window.l10n.get("TutoNextButtonContent")
 					}
 				]);
 			}
@@ -168,12 +121,12 @@ var Tutorial = {
 			introJs().setOptions({
 				tooltipClass: 'customTooltip',
 				steps: steps,
-				prevLabel: this.l10n.stringPrevShort,
-				nextLabel: this.l10n.stringNextShort,
+				prevLabel: window.l10n.get("PrevShort"),
+				nextLabel: window.l10n.get("NextShort"),
 				exitOnOverlayClick: false,
 				nextToDone: false,
 				showBullets: false
 			}).start();	
 		}
 	}
-}
+};