Commit 8b4be062 authored by Nicolas Wavrant's avatar Nicolas Wavrant

erp5_web_renderjs_ui: let gadget know the language in which the interface is rendered

parent 0573083e
...@@ -549,6 +549,9 @@ ...@@ -549,6 +549,9 @@
return route(this, 'translation_gadget', 'getTranslationList', return route(this, 'translation_gadget', 'getTranslationList',
argument_list); argument_list);
}) })
.allowPublicAcquisition("getSelectedLanguage", function getSelectedLanguage() {
return route(this, 'translation_gadget', 'getSelectedLanguage');
})
.allowPublicAcquisition("redirect", function redirect(param_list) { .allowPublicAcquisition("redirect", function redirect(param_list) {
return route(this, 'router', 'redirect', param_list); return route(this, 'router', 'redirect', param_list);
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>978.22304.53878.1495</string> </value> <value> <string>980.43952.30132.41164</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1577703410.93</float> <float>1577760448.33</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
/*global document, window, rJS, translation_data */ /*global document, window, RSVP, rJS, translation_data */
/*jslint nomen: true, indent: 2 */ /*jslint nomen: true, indent: 2 */
(function (document, window, rJS, translation_data) { (function (document, window, RSVP, rJS, translation_data) {
"use strict"; "use strict";
function getSelectedLanguage(gadget) {
var queue = new RSVP.Queue();
if (!gadget.state.language) {
queue.push(function () {
return gadget.getSettingList([
"selected_language",
"default_selected_language"
]);
})
.push(function (result_list) {
gadget.state.language = result_list[0] || result_list[1];
});
}
return queue.push(function () {
return gadget.state.language;
});
}
function translate(string, gadget) { function translate(string, gadget) {
if (translation_data[gadget.state.language]) { if (translation_data[gadget.state.language]) {
return translation_data[gadget.state.language][string] || string; return translation_data[gadget.state.language][string] || string;
...@@ -106,20 +126,17 @@ ...@@ -106,20 +126,17 @@
} }
function promiseTranslateList(gadget, string_list, only_first) { function promiseTranslateList(gadget, string_list, only_first) {
// XXX Allow to change the language return getSelectedLanguage(gadget)
if (!gadget.state.language) { .push(function () {
return gadget.getSettingList(["selected_language", return translateList(gadget, string_list, only_first);
"default_selected_language"]) });
.push(function (result_list) {
gadget.state.language = result_list[0] || result_list[1];
return translateList(gadget, string_list, only_first);
});
}
return translateList(gadget, string_list, only_first);
} }
rJS(window) rJS(window)
.declareAcquiredMethod("getSettingList", "getSettingList") .declareAcquiredMethod("getSettingList", "getSettingList")
.declareMethod('getSelectedLanguage', function () {
return getSelectedLanguage(this);
})
.declareMethod('getTranslationList', function (string_list) { .declareMethod('getTranslationList', function (string_list) {
return promiseTranslateList(this, string_list); return promiseTranslateList(this, string_list);
}) })
...@@ -129,15 +146,10 @@ ...@@ -129,15 +146,10 @@
.declareMethod('translateHtml', function (string) { .declareMethod('translateHtml', function (string) {
var gadget = this; var gadget = this;
if (!gadget.state.language) { return getSelectedLanguage(gadget)
return gadget.getSettingList(["selected_language", .push(function (language) {
"default_selected_language"]) return translateHtml(string, gadget);
.push(function (result_list) { });
gadget.state.language = result_list[0] || result_list[1];
return translateHtml(string, gadget);
});
}
return translateHtml(string, gadget);
}); });
}(document, window, rJS, translation_data)); }(document, window, RSVP, rJS, translation_data));
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment