From f458d788c8344e7f4461dff9f2b1c235c1188dcf Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 22 Feb 2017 19:07:42 +0100 Subject: [PATCH] gluon-config-mode-core: make welcome and reboot message optional Make use of our new _translate() function. --- .../lib/gluon/web/view/gluon/config-mode/welcome.html | 7 +++++-- .../lib/gluon/config-mode/reboot/0900-msg-reboot.lua | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/welcome.html b/package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/welcome.html index b2b8e577..22305131 100644 --- a/package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/welcome.html +++ b/package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/welcome.html @@ -1,9 +1,12 @@ <%- local sysconfig = require 'gluon.sysconfig' + + local msg = _translate('gluon-config-mode:welcome') + if not msg then return end -%>

- <%= - renderer.render_string(translate('gluon-config-mode:welcome'), { + <% + renderer.render_string(msg, { hostname = hostname, sysconfig = sysconfig, }) diff --git a/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua index 94ca3c0d..36f8ff3b 100644 --- a/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua +++ b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua @@ -7,7 +7,8 @@ local uci = require("simple-uci").cursor() local hostname = pretty_hostname.get(uci) local contact = uci:get_first('gluon-node-info', 'owner', 'contact') -local msg = translate('gluon-config-mode:reboot') +local msg = _translate('gluon-config-mode:reboot') +if not msg then return end renderer.render_string(msg, { hostname = hostname,