From 0ad54cc2d1270c6074643fe09933c6bfc4259642 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Sun, 27 May 2018 01:05:50 +0900 Subject: [PATCH 1/2] allow i18n translation in runtime --- red/runtime/i18n.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/red/runtime/i18n.js b/red/runtime/i18n.js index fc3599c87..336a2c9a6 100644 --- a/red/runtime/i18n.js +++ b/red/runtime/i18n.js @@ -81,16 +81,32 @@ var MessageFileLoader = { } +function current_locale() { + var env = process.env; + for (var name of ['LC_ALL', 'LC_MESSAGES', 'LANG']) { + if (name in env) { + var val = env[name]; + return val.substring(0, 2); + } + } + return undefined; +} + function init() { return when.promise(function(resolve,reject) { i18n.backend(MessageFileLoader); - i18n.init({ + var opt = { ns: { namespaces: [], defaultNs: "runtime" }, fallbackLng: [defaultLang] - },function() { + }; + var lang = current_locale(); + if (lang) { + opt.lng = lang; + } + i18n.init(opt ,function() { resolve(); }); }); From de43148341f5c381a9a1409c4a1c2dbbb0c5f080 Mon Sep 17 00:00:00 2001 From: Hiroyasu Nishiyama Date: Wed, 30 May 2018 20:32:56 +0900 Subject: [PATCH 2/2] change current_locale to getCurrentLocale --- red/runtime/i18n.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/red/runtime/i18n.js b/red/runtime/i18n.js index 336a2c9a6..b34564f47 100644 --- a/red/runtime/i18n.js +++ b/red/runtime/i18n.js @@ -81,7 +81,7 @@ var MessageFileLoader = { } -function current_locale() { +function getCurrentLocale() { var env = process.env; for (var name of ['LC_ALL', 'LC_MESSAGES', 'LANG']) { if (name in env) { @@ -102,7 +102,7 @@ function init() { }, fallbackLng: [defaultLang] }; - var lang = current_locale(); + var lang = getCurrentLocale(); if (lang) { opt.lng = lang; }