frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix language handling in subflow node

Browse Source
This commit is contained in:
Kazuhito Yokoi 2019-10-17 21:24:55 +09:00
parent e10dd54e2b
commit dae9ac8173
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js vendored
View File

@ -802,8 +802,8 @@ RED.subflow = (function() {
} }
$("<option/>", opt).text(item.text).appendTo(locales); $("<option/>", opt).text(item.text).appendTo(locales);
}); });
currentLocale = RED.i18n.lang(); var locale = RED.i18n.lang();
locales.val(currentLocale); locales.val(locale);
locales.on("change", function() { locales.on("change", function() {
currentLocale = $(this).val(); currentLocale = $(this).val();
@ -1371,7 +1371,8 @@ RED.subflow = (function() {
} }
var labels = ui.label || {}; var labels = ui.label || {};
var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, currentLocale); var locale = RED.i18n.lang();
var labelText = lookupLabel(labels, labels["en-US"]||tenv.name, locale);
var label = $('<label>').appendTo(row); var label = $('<label>').appendTo(row);
var labelContainer = $('<span></span>').appendTo(label); var labelContainer = $('<span></span>').appendTo(label);
if (ui.icon) { if (ui.icon) {
@ -1423,7 +1424,7 @@ RED.subflow = (function() {
input = $('<select>').css('width','70%').appendTo(row); input = $('<select>').css('width','70%').appendTo(row);
if (ui.opts.opts) { if (ui.opts.opts) {
ui.opts.opts.forEach(function(o) { ui.opts.opts.forEach(function(o) {
$('<option>').val(o.v).text(lookupLabel(o.l, o.l['en-US']||o.v, currentLocale)).appendTo(input); $('<option>').val(o.v).text(lookupLabel(o.l, o.l['en-US']||o.v, locale)).appendTo(input);
}) })
} }
input.val(val.value); input.val(val.value);