From 02913bef60cc074a82053c9a815fc1ce81a6cec7 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 27 Apr 2022 20:54:58 +0200 Subject: [PATCH] luci-mod-system: enforce availability of english as language choice Always offer english, regardless of whether a dummy language pack for it is installed or not. Fixes: #5783 Signed-off-by: Jo-Philipp Wich (cherry picked from commit c2eb30bba7451d16e1de37411624b2bcc449c037) --- .../htdocs/luci-static/resources/view/system/system.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js index aef11b2bc0..767bc8c619 100644 --- a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js @@ -228,10 +228,11 @@ return view.extend({ o.ucioption = 'lang'; o.value('auto'); - var k = Object.keys(uci.get('luci', 'languages') || {}).sort(); + var l = Object.assign({ en: 'English' }, uci.get('luci', 'languages')), + k = Object.keys(l).sort(); for (var i = 0; i < k.length; i++) if (k[i].charAt(0) != '.') - o.value(k[i], uci.get('luci', 'languages', k[i])); + o.value(k[i], l[k[i]]); o = s.taboption('language', form.ListValue, '_mediaurlbase', _('Design')) o.uciconfig = 'luci';