Wait localization to launch first screen tutorial

llaske · Aug 12, 2023 · 27d8ed7 · 27d8ed7
1 parent 2c7c727
commit 27d8ed7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/js/firstscreen.js b/js/firstscreen.js
@@ -94,10 +94,14 @@ enyo.kind({
 
 		// At first launch, display tutorial
 		var that = this;
-		window.setTimeout(function() {
+		var interval = window.setInterval(function() {
 			if (that.history.length == 0) {
+				if (!l10n.initialized) {
+					return;
+				}
 				that.startTutorial();
 			}
+			window.clearInterval(interval);
 		}, constant.timerBeforeTutorial);
 	},
 

diff --git a/lib/l10n.js b/lib/l10n.js
@@ -1,6 +1,5 @@
 define(['i18next.min', 'axios.min'], function (i18next, axios) {
-	const l10n = {language: {direction: "ltr"}};
-	let initialized = false;
+	const l10n = {language: {direction: "ltr"}, initialized: false};
 
 	l10n.init = async (lang) => {
 		await i18next.init({
@@ -38,12 +37,12 @@ define(['i18next.min', 'axios.min'], function (i18next, axios) {
 					l10n.init("en");
 				}
 				i18next.changeLanguage(lang);
-				initialized = true;
+				l10n.initialized = true;
 				triggerLocalizedEvent();
 			});
 		} else {
 			i18next.changeLanguage(lang);
-			initialized = true;
+			l10n.initialized = true;
 			triggerLocalizedEvent();
 		}
 	};