diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 329abe23eb2e4bdffe821b08fa9aade48c8fcea3..35946b27d95bde0bedfa9627040790f9722c8e17 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -36,9 +36,4 @@ define Package/gluon-config-mode-core/install $(call GluonInstallI18N,gluon-config-mode-core,$(1)) endef -define Package/gluon-config-mode-core/postinst -#!/bin/sh -$(call GluonCheckSite,check_site.lua) -endef - $(eval $(call BuildPackage,gluon-config-mode-core)) diff --git a/package/gluon-config-mode-core/check_site.lua b/package/gluon-config-mode-core/check_site.lua deleted file mode 100644 index 2ee08b0e43d5558ed25b0085329c378c4c7fff69..0000000000000000000000000000000000000000 --- a/package/gluon-config-mode-core/check_site.lua +++ /dev/null @@ -1,2 +0,0 @@ -need_string 'config_mode.msg_welcome' -need_string 'config_mode.msg_reboot' diff --git a/package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua b/package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua index e35bf308c57b54f95b1fdcbc3a08beb51ff3df37..bf27c07f7a8248326fee832ddafb325675f3522f 100644 --- a/package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua +++ b/package/gluon-config-mode-core/files/lib/gluon/config-mode/reboot/0900-msg-reboot.lua @@ -1,3 +1,3 @@ -local site = require 'gluon.site_config' +local i18n = require 'luci.i18n' -return function () luci.template.render_string(site.config_mode.msg_reboot) end +return function () luci.template.render_string(i18n.translate('gluon-config-mode:reboot')) end diff --git a/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm b/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm index ee0b2f8ef7bc198b643ead3d6ee2fe6a00be4c88..d2210ecad0761d41d940cde811fd3604e18e476d 100644 --- a/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm +++ b/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon-config-mode/cbi/wizard.htm @@ -1,12 +1,12 @@ <%- - local site = require 'gluon.site_config' local sysconfig = require 'gluon.sysconfig' + local i18n = require 'luci.i18n' local template = require 'luci.template' -%> <h2><%:Welcome!%></h2> <p> - <%= template.render_string(site.config_mode.msg_welcome, {hostname=hostname, sysconfig=sysconfig}) %> + <%= template.render_string(i18n.translate('gluon-config-mode:welcome'), {hostname=hostname, sysconfig=sysconfig}) %> </p> <% if not self.embedded then %>