Skip to content

Commit

Permalink
Merge branch 'pr/1371' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Jul 8, 2023
2 parents 0fa71b7 + 06c44d8 commit c67c33c
Show file tree
Hide file tree
Showing 22 changed files with 174 additions and 1,830 deletions.
1 change: 0 additions & 1 deletion activities/QRCode.activity/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<meta charset="utf-8" />
<title>QR Code</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)"
Expand Down
8 changes: 4 additions & 4 deletions activities/QRCode.activity/js/activity.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "webL10n", "tutorial"], function (activity, datastore, env, webL10n, tutorial) {
define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "l10n", "tutorial"], function (activity, datastore, env, l10n, tutorial) {

// Manipulate the DOM only when it is ready.
requirejs(['domReady!', 'humane'], function (doc, humane) {
Expand All @@ -13,7 +13,7 @@ define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "w
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;
webL10n.language.code = language;
l10n.init(language);
});

// Compute size of QR Code
Expand Down Expand Up @@ -107,7 +107,7 @@ define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "w
});
//localization for placeholder text
window.addEventListener("localized", function() {
document.getElementById("user-text").placeholder = webL10n.get("Text");
document.getElementById("user-text").placeholder = l10n.get("Text");
});

var input = document.getElementById("user-text");
Expand Down Expand Up @@ -162,7 +162,7 @@ define(["sugar-web/activity/activity","sugar-web/datastore", "sugar-web/env", "w
file_size: 0
};
datastore.create(metadata, function() {
humane.log(webL10n.get('QRCodeSaved'))
humane.log(l10n.get('QRCodeSaved'))
console.log("export done.")
}, inputData);
});
Expand Down
3 changes: 3 additions & 0 deletions activities/QRCode.activity/lib/axios.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions activities/QRCode.activity/lib/i18next.min.js

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions activities/QRCode.activity/lib/l10n.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
define(['i18next.min', 'axios.min'], function (i18next, axios) {
const l10n = {};
let initialized = false;

l10n.init = async (lang) => {
await i18next.init({
lng: lang,
debug: true,
fallbackLng: "en",
resources: {}
}).then(() => {
l10n.switchTo(lang);
});
};

l10n.get = (key) => {
return i18next.t(key);
};

l10n.loadLanguageResource = (lang) => {
return new Promise((resolve, reject) => {
axios.get("./locales/" + lang + ".json").then((response) => {
resolve(response.data);
}).catch((error) => {
console.log("Failed to load " + lang + " language: " + error);
resolve(null); // Resolve with null to indicate failure
});
});
};

l10n.switchTo = (lang) => {
if (!i18next.hasResourceBundle(lang, "translation")) {
console.log("Loading " + lang + " language");
l10n.loadLanguageResource(lang).then((locales) => {
if (locales !== null) {
i18next.addResourceBundle(lang, "translation", locales);
} else {
l10n.init("en");
}
i18next.changeLanguage(lang);
initialized = true;
triggerLocalizedEvent();
});
} else {
i18next.changeLanguage(lang);
initialized = true;
triggerLocalizedEvent();
}
};


function triggerLocalizedEvent() {
const event = new Event("localized");
window.dispatchEvent(event);
};

return l10n;
});
7 changes: 2 additions & 5 deletions activities/QRCode.activity/lib/sugar-web/activity/activity.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
define(["webL10n",
"sugar-web/activity/shortcut",
define(["sugar-web/activity/shortcut",
"sugar-web/bus",
"sugar-web/env",
"sugar-web/datastore",
"sugar-web/presence",
"sugar-web/graphics/icon",
"sugar-web/graphics/activitypalette"], function (
l10n, shortcut, bus, env, datastore, presence, icon, activitypalette) {
shortcut, bus, env, datastore, presence, icon, activitypalette) {

'use strict';

Expand All @@ -22,8 +21,6 @@ define(["webL10n",
activity.setup = function () {
bus.listen();

l10n.start();

function sendPauseEvent() {
var pauseEvent = document.createEvent("CustomEvent");
pauseEvent.initCustomEvent('activityPause', false, false, {
Expand Down
1 change: 0 additions & 1 deletion activities/QRCode.activity/lib/sugar-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"volo": {
"baseUrl": "lib",
"dependencies": {
"webL10n": "github:sugarlabs/webL10n",
"mustache": "github:janl/mustache.js/0.7.2",
"text": "github:requirejs/text"
}
Expand Down
1 change: 0 additions & 1 deletion activities/QRCode.activity/lib/sugar-web/test/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ requirejs.config({
"sugar-web": ".",
"mustache": "lib/mustache",
"text": "lib/text",
"webL10n": "lib/webL10n"
},

// ask Require.js to load these files (all our tests)
Expand Down
2 changes: 1 addition & 1 deletion activities/QRCode.activity/lib/tutorial.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(["webL10n"], function (l10n) {
define(["l10n"], function (l10n) {
var tutorial = {};
tutorial.start = function () {
var steps = [
Expand Down
Loading

0 comments on commit c67c33c

Please sign in to comment.