Merge branch 'pr/1389' into dev

llaske · Aug 14, 2023 · aa323c2 · aa323c2
2 parents 27d8ed7 + b57ab18
commit aa323c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/js/firstscreen.js b/js/firstscreen.js
@@ -94,15 +94,11 @@ enyo.kind({
 
 		// At first launch, display tutorial
 		var that = this;
-		var interval = window.setInterval(function() {
-			if (that.history.length == 0) {
-				if (!l10n.initialized) {
-					return;
-				}
+		window.addEventListener("localized", function () {
+			if (that.history.length === 0) {
 				that.startTutorial();
 			}
-			window.clearInterval(interval);
-		}, constant.timerBeforeTutorial);
+		}, {once : true})
 	},
 
 	localize: function() {

diff --git a/lib/l10n.js b/lib/l10n.js
@@ -1,5 +1,5 @@
 define(['i18next.min', 'axios.min'], function (i18next, axios) {
-	const l10n = {language: {direction: "ltr"}, initialized: false};
+	const l10n = {language: {direction: "ltr"}};
 
 	l10n.init = async (lang) => {
 		await i18next.init({
@@ -33,16 +33,14 @@ define(['i18next.min', 'axios.min'], function (i18next, axios) {
 			l10n.loadLanguageResource(lang).then((locales) => {
 				if (locales !== null) {
 					i18next.addResourceBundle(lang, "translation", locales);
+					i18next.changeLanguage(lang);
+					triggerLocalizedEvent();
 				} else {
 					l10n.init("en");
 				}
-				i18next.changeLanguage(lang);
-				l10n.initialized = true;
-				triggerLocalizedEvent();
 			});
 		} else {
 			i18next.changeLanguage(lang);
-			l10n.initialized = true;
 			triggerLocalizedEvent();
 		}
 	};