diff --git a/activities/FoodChain.activity/js/activity.js b/activities/FoodChain.activity/js/activity.js index de3fcf0d4..5f10f8d92 100644 --- a/activities/FoodChain.activity/js/activity.js +++ b/activities/FoodChain.activity/js/activity.js @@ -1,7 +1,8 @@  -define(["sugar-web/activity/activity","l10n","sugar-web/graphics/radiobuttonsgroup","sugar-web/datastore","tutorial", "sugar-web/env"], function (activity, l10n, radioButtonsGroup, datastore, tutorial, env) { +define(["sugar-web/activity/activity","l10n","sugar-web/graphics/radiobuttonsgroup","sugar-web/datastore","tutorial", "sugar-web/env"], function (activity, _l10n, radioButtonsGroup, datastore, tutorial, env) { var app = null; + l10n = _l10n // Manipulate the DOM only when it is ready. requirejs(['domReady!'], function (doc) { @@ -16,14 +17,17 @@ define(["sugar-web/activity/activity","l10n","sugar-web/graphics/radiobuttonsgro ); document.getElementById("en-button").onclick = function() { l10n.init("en"); + l10n.language.code = "en"; FoodChain.setLocale(); }; document.getElementById("fr-button").onclick = function() { l10n.init("fr"); + l10n.language.code = "fr"; FoodChain.setLocale(); }; document.getElementById("pt_BR-button").onclick = function() { l10n.init("pt_BR"); + l10n.language.code = "pt_BR"; FoodChain.setLocale(); }; // Launch tutorial @@ -40,8 +44,10 @@ define(["sugar-web/activity/activity","l10n","sugar-web/graphics/radiobuttonsgro var defaultLanguage = (typeof chrome != 'undefined' && chrome.app && chrome.app.runtime) ? chrome.i18n.getUILanguage() : navigator.language; var language = environment.user ? environment.user.language : defaultLanguage; if (language == 'fr' || language == 'en') { + l10n.language.code = language; l10n.init(language); } else if (language == 'pt') { + l10n.language.code = "pt_BR"; l10n.init("pt_BR"); } @@ -70,6 +76,7 @@ define(["sugar-web/activity/activity","l10n","sugar-web/graphics/radiobuttonsgro FoodChain.setLocale(); } }; + localized_received(); //invoke to init the app window.addEventListener('localized', localized_received, false); // Stop sound at end of game to sanitize media environment, specifically on Android diff --git a/activities/FoodChain.activity/l10n.js b/activities/FoodChain.activity/l10n.js index 7244ebf21..7dbf564c7 100644 --- a/activities/FoodChain.activity/l10n.js +++ b/activities/FoodChain.activity/l10n.js @@ -1,6 +1,6 @@ // Localization API - var l10n; + var l10n; //loaded by activity.js // Localization function