From 1d76d8a2158ec397322e54da0b6ad3ca4cadb621 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 12 Aug 2011 13:16:27 +0000 Subject: applications, modules: remove i18n handling from controller modules as it moved to the themes now --- applications/luci-ahcp/luasrc/controller/ahcp.lua | 5 +- .../luasrc/controller/coovachilli.lua | 14 ++- applications/luci-ddns/luasrc/controller/ddns.lua | 12 +-- .../luci-diag-core/luasrc/controller/luci_diag.lua | 23 +++-- .../controller/luci_diag/luci_diag_devinfo.lua | 26 +++--- .../luci-ffwizard/luasrc/controller/ffwizard.lua | 9 +- .../luasrc/controller/luci_fw/luci_fw.lua | 7 +- .../luasrc/controller/freifunk/policy-routing.lua | 9 +- .../luci-hd-idle/luasrc/controller/hd_idle.lua | 18 ++-- .../luasrc/controller/lqtapifoss.lua | 11 ++- .../luasrc/controller/meshwizard.lua | 4 +- .../luasrc/controller/mmc_over_gpio.lua | 18 ++-- .../luci-multiwan/luasrc/controller/multiwan.lua | 18 ++-- applications/luci-ntpc/luasrc/controller/ntpc.lua | 14 +-- .../luasrc/controller/services.lua | 3 +- .../luci-olsr-viz/luasrc/controller/olsr-viz.lua | 2 +- applications/luci-olsr/luasrc/controller/olsr.lua | 25 +++-- .../luci-openvpn/luasrc/controller/openvpn.lua | 6 +- .../luasrc/controller/ff_p2pblock.lua | 3 +- .../luci-p910nd/luasrc/controller/p910nd.lua | 18 ++-- .../luci-polipo/luasrc/controller/polipo.lua | 10 +- applications/luci-qos/luasrc/controller/qos.lua | 10 +- .../luci-radvd/luasrc/controller/radvd.lua | 2 +- .../luci-samba/luasrc/controller/samba.lua | 11 ++- .../luasrc/controller/splash/splash.lua | 14 +-- .../controller/luci_statistics/luci_statistics.lua | 104 ++++++++++----------- .../luci-tinyproxy/luasrc/controller/tinyproxy.lua | 9 +- applications/luci-upnp/luasrc/controller/upnp.lua | 5 +- .../luci-ushare/luasrc/controller/ushare.lua | 18 ++-- .../luci-vnstat/luasrc/controller/vnstat.lua | 15 ++- .../luasrc/controller/luci_voice.lua | 12 +-- .../controller/luci_voice/luci_voice_diag.lua | 12 +-- applications/luci-wol/luasrc/controller/wol.lua | 7 +- 33 files changed, 218 insertions(+), 256 deletions(-) (limited to 'applications') diff --git a/applications/luci-ahcp/luasrc/controller/ahcp.lua b/applications/luci-ahcp/luasrc/controller/ahcp.lua index ea7390311..5667bb532 100644 --- a/applications/luci-ahcp/luasrc/controller/ahcp.lua +++ b/applications/luci-ahcp/luasrc/controller/ahcp.lua @@ -19,10 +19,7 @@ function index() return end - require("luci.i18n") - luci.i18n.loadc("ahcp") - - entry({"admin", "network", "ahcpd"}, cbi("ahcp"), luci.i18n.translate("AHCP Server"), 90).i18n = "ahcp" + entry({"admin", "network", "ahcpd"}, cbi("ahcp"), _("AHCP Server"), 90).i18n = "ahcp" entry({"admin", "network", "ahcpd", "status"}, call("ahcp_status")) end diff --git a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua index 52e09f6f5..73a2c518a 100644 --- a/applications/luci-coovachilli/luasrc/controller/coovachilli.lua +++ b/applications/luci-coovachilli/luasrc/controller/coovachilli.lua @@ -11,19 +11,17 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.coovachilli", package.seeall) function index() + local cc - require("luci.i18n") - local i18n = luci.i18n.translate - - local cc = entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), i18n("CoovaChilli"), 90) + cc = entry( { "admin", "services", "coovachilli" }, cbi("coovachilli"), _("CoovaChilli"), 90) cc.i18n = "coovachilli" cc.subindex = true - - entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), i18n("Network Configuration"), 10) - entry( { "admin", "services", "coovachilli", "radius" }, cbi("coovachilli_radius"), i18n("RADIUS configuration"), 20) - entry( { "admin", "services", "coovachilli", "auth" }, cbi("coovachilli_auth"), i18n("UAM and MAC Authentication"), 30) + entry( { "admin", "services", "coovachilli", "network" }, cbi("coovachilli_network"), _("Network Configuration"), 10) + entry( { "admin", "services", "coovachilli", "radius" }, cbi("coovachilli_radius"), _("RADIUS configuration"), 20) + entry( { "admin", "services", "coovachilli", "auth" }, cbi("coovachilli_auth"), _("UAM and MAC Authentication"), 30) end diff --git a/applications/luci-ddns/luasrc/controller/ddns.lua b/applications/luci-ddns/luasrc/controller/ddns.lua index 8e1bc665a..e2f786b32 100644 --- a/applications/luci-ddns/luasrc/controller/ddns.lua +++ b/applications/luci-ddns/luasrc/controller/ddns.lua @@ -12,21 +12,21 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.ddns", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("ddns") if not nixio.fs.access("/etc/config/ddns") then return end - local page = entry({"admin", "services", "ddns"}, cbi("ddns/ddns"), luci.i18n.translate("Dynamic DNS"), 60) + local page + + page = entry({"admin", "services", "ddns"}, cbi("ddns/ddns"), _("Dynamic DNS"), 60) page.i18n = "ddns" page.dependent = true - - - local page = entry({"mini", "network", "ddns"}, cbi("ddns/ddns", {autoapply=true}), luci.i18n.translate("Dynamic DNS"), 60) + + page = entry({"mini", "network", "ddns"}, cbi("ddns/ddns", {autoapply=true}), _("Dynamic DNS"), 60) page.i18n = "ddns" page.dependent = true end diff --git a/applications/luci-diag-core/luasrc/controller/luci_diag.lua b/applications/luci-diag-core/luasrc/controller/luci_diag.lua index 23b8d0009..c12399431 100644 --- a/applications/luci-diag-core/luasrc/controller/luci_diag.lua +++ b/applications/luci-diag-core/luasrc/controller/luci_diag.lua @@ -16,16 +16,15 @@ require("luci.i18n") module("luci.controller.luci_diag", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("diag_core") - - local e = entry({"admin", "network", "diag_config"}, template("diag/network_config_index") , luci.i18n.translate("Configure Diagnostics"), 120) - e.index = true - e.i18n = "diag_core" - e.dependent = true - - e = entry({"mini", "diag"}, template("diag/index"), luci.i18n.translate("l_d_diag"), 120) - e.index = true - e.i18n = "diag_core" - e.dependent = true + local e + + e = entry({"admin", "network", "diag_config"}, template("diag/network_config_index") , _("Configure Diagnostics"), 120) + e.index = true + e.i18n = "diag_core" + e.dependent = true + + e = entry({"mini", "diag"}, template("diag/index"), _("Diagnostics"), 120) + e.index = true + e.i18n = "diag_core" + e.dependent = true end diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua index e40a3e82c..e8a2f5043 100644 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua +++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua @@ -11,58 +11,56 @@ You may obtain a copy of the License at ]]-- - module("luci.controller.luci_diag.luci_diag_devinfo", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("diag_devinfo") + local e - local e = entry({"admin", "voice", "diag", "phones"}, arcombine(cbi("luci_diag/smap_devinfo"), cbi("luci_diag/smap_devinfo_config")), luci.i18n.translate("Phones"), 10) + e = entry({"admin", "voice", "diag", "phones"}, arcombine(cbi("luci_diag/smap_devinfo"), cbi("luci_diag/smap_devinfo_config")), _("Phones"), 10) e.leaf = true e.subindex = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "voice", "diag", "phones", "config"}, cbi("luci_diag/smap_devinfo_config"), luci.i18n.translate("Configure"), 10) + e = entry({"admin", "voice", "diag", "phones", "config"}, cbi("luci_diag/smap_devinfo_config"), _("Configure"), 10) e.i18n = "diag_devinfo" - e = entry({"admin", "status", "smap_devinfo"}, cbi("luci_diag/smap_devinfo"), luci.i18n.translate("SIP Devices on Network"), 120) + e = entry({"admin", "status", "smap_devinfo"}, cbi("luci_diag/smap_devinfo"), _("SIP Devices on Network"), 120) e.leaf = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "network", "diag_config", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config"), luci.i18n.translate("Network Device Scan"), 100) + e = entry({"admin", "network", "diag_config", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config"), _("Network Device Scan"), 100) e.leaf = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "network", "diag_config", "smap_devinfo_config"}, cbi("luci_diag/smap_devinfo_config"), luci.i18n.translate("SIP Device Scan")) + e = entry({"admin", "network", "diag_config", "smap_devinfo_config"}, cbi("luci_diag/smap_devinfo_config"), _("SIP Device Scan")) e.leaf = true e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "status", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo"), luci.i18n.translate("Devices on Network"), 90) + e = entry({"admin", "status", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo"), _("Devices on Network"), 90) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"admin", "network", "mactodevinfo"}, cbi("luci_diag/mactodevinfo"), luci.i18n.translate("MAC Device Info Overrides"), 190) + e = entry({"admin", "network", "mactodevinfo"}, cbi("luci_diag/mactodevinfo"), _("MAC Device Info Overrides"), 190) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "diag", "phone_scan"}, cbi("luci_diag/smap_devinfo_mini"), luci.i18n.translate("Phone Scan"), 100) + e = entry({"mini", "diag", "phone_scan"}, cbi("luci_diag/smap_devinfo_mini"), _("Phone Scan"), 100) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "voice", "phones", "phone_scan_config"}, cbi("luci_diag/smap_devinfo_config_mini"), luci.i18n.translate("Config Phone Scan"), 90) + e = entry({"mini", "voice", "phones", "phone_scan_config"}, cbi("luci_diag/smap_devinfo_config_mini"), _("Config Phone Scan"), 90) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "diag", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo_mini"), luci.i18n.translate("Network Device Scan"), 10) + e = entry({"mini", "diag", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo_mini"), _("Network Device Scan"), 10) e.i18n = "diag_devinfo" e.dependent = true - e = entry({"mini", "network", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config_mini"), luci.i18n.translate("Device Scan Config")) + e = entry({"mini", "network", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config_mini"), _("Device Scan Config")) e.i18n = "diag_devinfo" e.dependent = true diff --git a/applications/luci-ffwizard/luasrc/controller/ffwizard.lua b/applications/luci-ffwizard/luasrc/controller/ffwizard.lua index 53ceb3a54..5ba33a12a 100644 --- a/applications/luci-ffwizard/luasrc/controller/ffwizard.lua +++ b/applications/luci-ffwizard/luasrc/controller/ffwizard.lua @@ -18,13 +18,10 @@ $Id$ module "luci.controller.ffwizard" function index() - require("luci.i18n").loadc("ffwizard") - local i18n = luci.i18n.translate - - entry({"admin", "freifunk", "ffwizard"}, form("freifunk/ffwizard"), i18n("Wizard"), 40) - assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, i18n("Wizard"), 40) + entry({"admin", "freifunk", "ffwizard"}, form("freifunk/ffwizard"), _("Wizard"), 40).i18n = "ffwizard" + assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, _("Wizard"), 40) - entry({"admin", "freifunk", "ffwizard_error"}, template("freifunk/ffwizard_error")) + entry({"admin", "freifunk", "ffwizard_error"}, template("freifunk/ffwizard_error")).i18n = "ffwizard" assign({"mini", "freifunk", "ffwizard_error"}, {"admin", "freifunk", "ffwizard_error"}) end diff --git a/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua b/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua index 5dd84bc90..b3d440d1c 100644 --- a/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua +++ b/applications/luci-firewall/luasrc/controller/luci_fw/luci_fw.lua @@ -1,13 +1,10 @@ module("luci.controller.luci_fw.luci_fw", package.seeall) function index() - require("luci.i18n").loadc("luci-fw") - local i18n = luci.i18n.translate - - entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), i18n("Firewall"), 60).i18n = "firewall" + entry({"admin", "network", "firewall"}, alias("admin", "network", "firewall", "zones"), _("Firewall"), 60).i18n = "firewall" entry({"admin", "network", "firewall", "zones"}, arcombine(cbi("luci_fw/zones"), cbi("luci_fw/zone")), nil, 10).leaf = true entry({"admin", "network", "firewall", "rule"}, arcombine(cbi("luci_fw/zones"), cbi("luci_fw/trule")), nil, 20).leaf = true entry({"admin", "network", "firewall", "redirect"}, arcombine(cbi("luci_fw/zones"), cbi("luci_fw/rrule")), nil, 30).leaf = true - entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), i18n("Port forwarding"), 70).i18n = "firewall" + entry({"mini", "network", "portfw"}, cbi("luci_fw/miniportfw", {autoapply=true}), _("Port forwarding"), 70).i18n = "firewall" end diff --git a/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua b/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua index 32c9c0ba4..e8aca9ce5 100644 --- a/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua +++ b/applications/luci-freifunk-policyrouting/luasrc/controller/freifunk/policy-routing.lua @@ -10,14 +10,9 @@ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 ]]-- - module "luci.controller.freifunk.policy-routing" function index() - require("luci.i18n").loadc("freifunk-policyrouting") - local i18n = luci.i18n.translate - - entry({"admin", "freifunk", "policyrouting"}, cbi("freifunk/policyrouting"), i18n("Policy Routing"), 60) + entry({"admin", "freifunk", "policyrouting"}, cbi("freifunk/policyrouting"), + _("Policy Routing"), 60).i18n = "freifunk-policyrouting" end - - diff --git a/applications/luci-hd-idle/luasrc/controller/hd_idle.lua b/applications/luci-hd-idle/luasrc/controller/hd_idle.lua index 9d5e5b3b3..e28983f39 100644 --- a/applications/luci-hd-idle/luasrc/controller/hd_idle.lua +++ b/applications/luci-hd-idle/luasrc/controller/hd_idle.lua @@ -16,13 +16,13 @@ $Id$ module("luci.controller.hd_idle", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("hd_idle") - if not nixio.fs.access("/etc/config/hd-idle") then - return - end - - local page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), luci.i18n.translate("hd-idle"), 60) - page.i18n = "hd_idle" - page.dependent = true + if not nixio.fs.access("/etc/config/hd-idle") then + return + end + + local page + + page = entry({"admin", "services", "hd_idle"}, cbi("hd_idle"), _("hd-idle"), 60) + page.i18n = "hd_idle" + page.dependent = true end diff --git a/applications/luci-lqtapifoss/luasrc/controller/lqtapifoss.lua b/applications/luci-lqtapifoss/luasrc/controller/lqtapifoss.lua index 08941874a..323f8a7c4 100644 --- a/applications/luci-lqtapifoss/luasrc/controller/lqtapifoss.lua +++ b/applications/luci-lqtapifoss/luasrc/controller/lqtapifoss.lua @@ -10,6 +10,7 @@ You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 ]]-- + module("luci.controller.lqtapifoss", package.seeall) function index() @@ -17,11 +18,13 @@ function index() return end - local e = entry({"admin", "telephony"}, template("luci_lqvoip/index") , luci.i18n.translate("VoIP"), 90) + local e + + e = entry({"admin", "telephony"}, template("luci_lqvoip/index") , _("VoIP"), 90) e.index = true e.i18n = "telephony" - --local e = entry({"admin", "telephony", "config"}, cbi("luci_lqvoip/config") , luci.i18n.translate("Config"), 10) - local e = entry({"admin", "telephony", "account"}, cbi("luci_lqvoip/account") , luci.i18n.translate("Account"), 20) - local e = entry({"admin", "telephony", "contact"}, cbi("luci_lqvoip/contact") , luci.i18n.translate("Contacts"), 30) + --entry({"admin", "telephony", "config"}, cbi("luci_lqvoip/config") , _("Config"), 10) + entry({"admin", "telephony", "account"}, cbi("luci_lqvoip/account") , _("Account"), 20) + entry({"admin", "telephony", "contact"}, cbi("luci_lqvoip/contact") , _("Contacts"), 30) end diff --git a/applications/luci-meshwizard/luasrc/controller/meshwizard.lua b/applications/luci-meshwizard/luasrc/controller/meshwizard.lua index 4e930cc50..942987db5 100644 --- a/applications/luci-meshwizard/luasrc/controller/meshwizard.lua +++ b/applications/luci-meshwizard/luasrc/controller/meshwizard.lua @@ -14,8 +14,6 @@ http://www.apache.org/licenses/LICENSE-2.0 module "luci.controller.meshwizard" function index() - require("luci.i18n").loadc("meshwizard") - local i18n = luci.i18n.translate - entry({"admin", "freifunk", "meshwizard"}, cbi("freifunk/meshwizard"), i18n("Mesh Wizard"), 40) + entry({"admin", "freifunk", "meshwizard"}, cbi("freifunk/meshwizard"), _("Mesh Wizard"), 40) end diff --git a/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua b/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua index 9ee2a9dec..5abceab7a 100644 --- a/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua +++ b/applications/luci-mmc-over-gpio/luasrc/controller/mmc_over_gpio.lua @@ -16,13 +16,13 @@ $Id$ module("luci.controller.mmc_over_gpio", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("mmc_over_gpio") - if not nixio.fs.access("/etc/config/mmc_over_gpio") then - return - end - - local page = entry({"admin", "system", "mmc_over_gpio"}, cbi("mmc_over_gpio"), luci.i18n.translate("MMC/SD driver configuration"), 60) - page.i18n = "mmc_over_gpio" - page.dependent = true + if not nixio.fs.access("/etc/config/mmc_over_gpio") then + return + end + + local page + + page = entry({"admin", "system", "mmc_over_gpio"}, cbi("mmc_over_gpio"), _("MMC/SD driver configuration"), 60) + page.i18n = "mmc_over_gpio" + page.dependent = true end diff --git a/applications/luci-multiwan/luasrc/controller/multiwan.lua b/applications/luci-multiwan/luasrc/controller/multiwan.lua index 561747b0f..2a45c5f7b 100644 --- a/applications/luci-multiwan/luasrc/controller/multiwan.lua +++ b/applications/luci-multiwan/luasrc/controller/multiwan.lua @@ -1,18 +1,18 @@ module("luci.controller.multiwan", package.seeall) function index() - local fs = luci.fs or nixio.fs - if not fs.access("/etc/config/multiwan") then + local fs = luci.fs or nixio.fs + if not fs.access("/etc/config/multiwan") then return end - - local page = entry({"admin", "network", "multiwan"}, cbi("multiwan/multiwan"), "Multi-WAN") - page.i18n = "multiwan" - page.dependent = true - local page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), "Multi-WAN") - page.i18n = "multiwan" - page.dependent = true + local page + page = entry({"admin", "network", "multiwan"}, cbi("multiwan/multiwan"), _("Multi-WAN")) + page.i18n = "multiwan" + page.dependent = true + page = entry({"mini", "network", "multiwan"}, cbi("multiwan/multiwanmini", {autoapply=true}), _("Multi-WAN")) + page.i18n = "multiwan" + page.dependent = true end diff --git a/applications/luci-ntpc/luasrc/controller/ntpc.lua b/applications/luci-ntpc/luasrc/controller/ntpc.lua index b6af6f950..782e21614 100644 --- a/applications/luci-ntpc/luasrc/controller/ntpc.lua +++ b/applications/luci-ntpc/luasrc/controller/ntpc.lua @@ -12,21 +12,21 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.ntpc", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("ntpc") if not nixio.fs.access("/etc/config/ntpclient") then return end - local page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), luci.i18n.translate("Time Synchronisation"), 50) + local page + + page = entry({"admin", "system", "ntpc"}, cbi("ntpc/ntpc"), _("Time Synchronisation"), 50) page.i18n = "ntpc" page.dependent = true - - - local page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), luci.i18n.translate("Time Synchronisation"), 50) + + page = entry({"mini", "system", "ntpc"}, cbi("ntpc/ntpcmini", {autoapply=true}), _("Time Synchronisation"), 50) page.i18n = "ntpc" page.dependent = true -end \ No newline at end of file +end diff --git a/applications/luci-olsr-services/luasrc/controller/services.lua b/applications/luci-olsr-services/luasrc/controller/services.lua index cc1a2f62e..a4636bfd5 100644 --- a/applications/luci-olsr-services/luasrc/controller/services.lua +++ b/applications/luci-olsr-services/luasrc/controller/services.lua @@ -2,7 +2,6 @@ module "luci.controller.services" function index() local uci = require "luci.model.uci".cursor() - local i18n = luci.i18n.translate uci:foreach("olsrd", "LoadPlugin", function(s) if s.library == "olsrd_nameservice.so.0.3" then @@ -11,7 +10,7 @@ function index() end) if has_serv then - entry({"freifunk", "services"}, template("freifunk-services/services"), i18n("Services"), 60) + entry({"freifunk", "services"}, template("freifunk-services/services"), _("Services"), 60) end end diff --git a/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua b/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua index 4981f8d05..672486c53 100644 --- a/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua +++ b/applications/luci-olsr-viz/luasrc/controller/olsr-viz.lua @@ -1,5 +1,5 @@ module "luci.controller.olsr-viz" function index() - entry({"admin", "status", "olsr", "olsr-viz"}, template("olsr-viz/olsr-viz"), "OLSR-Viz", 90) + entry({"admin", "status", "olsr", "olsr-viz"}, template("olsr-viz/olsr-viz"), _("OLSR-Viz"), 90) end diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua index c7c7f0141..6d6dc1ace 100644 --- a/applications/luci-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-olsr/luasrc/controller/olsr.lua @@ -5,49 +5,46 @@ function index() return end - require("luci.i18n").loadc("olsr") - local i18n = luci.i18n.translate - local page = node("admin", "status", "olsr") page.target = template("status-olsr/overview") - page.title = i18n("OLSR") + page.title = _("OLSR") page.i18n = "olsr" page.subindex = true local page = node("admin", "status", "olsr", "neighbors") page.target = call("action_neigh") - page.title = i18n("Neighbours") + page.title = _("Neighbours") page.subindex = true page.order = 5 local page = node("admin", "status", "olsr", "routes") page.target = call("action_routes") - page.title = i18n("Routes") + page.title = _("Routes") page.order = 10 local page = node("admin", "status", "olsr", "topology") page.target = call("action_topology") - page.title = i18n("Topology") + page.title = _("Topology") page.order = 20 local page = node("admin", "status", "olsr", "hna") page.target = call("action_hna") - page.title = i18n("HNA") + page.title = _("HNA") page.order = 30 local page = node("admin", "status", "olsr", "mid") page.target = call("action_mid") - page.title = i18n("MID") + page.title = _("MID") page.order = 50 local page = node("admin", "status", "olsr", "smartgw") page.target = call("action_smartgw") - page.title = i18n("SmartGW") + page.title = _("SmartGW") page.order = 60 local page = node("admin", "status", "olsr", "interfaces") page.target = call("action_interfaces") - page.title = i18n("Interfaces") + page.title = _("Interfaces") page.order = 70 local ol = entry( @@ -64,17 +61,17 @@ function index() entry( {"admin", "services", "olsrd", "hna"}, - cbi("olsr/olsrdhna"), i18n("HNA Announcements") + cbi("olsr/olsrdhna"), _("HNA Announcements") ) oplg = entry( {"admin", "services", "olsrd", "plugins"}, - cbi("olsr/olsrdplugins"), i18n("Plugins") + cbi("olsr/olsrdplugins"), _("Plugins") ) odsp = entry( {"admin", "services", "olsrd", "display"}, - cbi("olsr/olsrddisplay"), i18n("Display") + cbi("olsr/olsrddisplay"), _("Display") ) oplg.i18n = "olsr" diff --git a/applications/luci-openvpn/luasrc/controller/openvpn.lua b/applications/luci-openvpn/luasrc/controller/openvpn.lua index ddfa99091..691ce178d 100644 --- a/applications/luci-openvpn/luasrc/controller/openvpn.lua +++ b/applications/luci-openvpn/luasrc/controller/openvpn.lua @@ -12,13 +12,11 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.openvpn", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("openvpn") - - entry( {"admin", "services", "openvpn"}, cbi("openvpn"), luci.i18n.translate("OpenVPN") ).i18n = "openvpn" + entry( {"admin", "services", "openvpn"}, cbi("openvpn"), _("OpenVPN") ).i18n = "openvpn" entry( {"admin", "services", "openvpn", "basic"}, cbi("openvpn-basic"), nil ).leaf = true entry( {"admin", "services", "openvpn", "advanced"}, cbi("openvpn-advanced"), nil ).leaf = true end diff --git a/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua b/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua index 651172cd1..50c9e7a1a 100644 --- a/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua +++ b/applications/luci-p2pblock/luasrc/controller/ff_p2pblock.lua @@ -15,7 +15,6 @@ $Id$ module("luci.controller.ff_p2pblock", package.seeall) function index() - require("luci.i18n").loadc("p2pblock") entry({"admin", "network", "firewall", "p2pblock"}, cbi("luci_fw/p2pblock"), - luci.i18n.translate("P2P-Block"), 40) + _("P2P-Block"), 40).i18n = "p2pblock" end diff --git a/applications/luci-p910nd/luasrc/controller/p910nd.lua b/applications/luci-p910nd/luasrc/controller/p910nd.lua index c2fe3fa51..bc38c2bb9 100644 --- a/applications/luci-p910nd/luasrc/controller/p910nd.lua +++ b/applications/luci-p910nd/luasrc/controller/p910nd.lua @@ -16,13 +16,13 @@ $Id$ module("luci.controller.p910nd", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("p910nd") - if not nixio.fs.access("/etc/config/p910nd") then - return - end - - local page = entry({"admin", "services", "p910nd"}, cbi("p910nd"), luci.i18n.translate("p910nd - Printer server"), 60) - page.i18n = "p910nd" - page.dependent = true + if not nixio.fs.access("/etc/config/p910nd") then + return + end + + local page + + page = entry({"admin", "services", "p910nd"}, cbi("p910nd"), _("p910nd - Printer server"), 60) + page.i18n = "p910nd" + page.dependent = true end diff --git a/applications/luci-polipo/luasrc/controller/polipo.lua b/applications/luci-polipo/luasrc/controller/polipo.lua index 1ee67e238..d07eaebd4 100644 --- a/applications/luci-polipo/luasrc/controller/polipo.lua +++ b/applications/luci-polipo/luasrc/controller/polipo.lua @@ -11,6 +11,7 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.polipo", package.seeall) function index() @@ -18,11 +19,8 @@ function index() return end - require("luci.i18n").loadc("polipo") - local i18n = luci.i18n.translate - - entry({"admin", "services", "polipo"}, alias("admin", "services", "polipo", "config"), "Polipo").i18n = "polipo" - entry({"admin", "services", "polipo", "status"}, template("polipo_status"), i18n("Status")) - entry({"admin", "services", "polipo", "config"}, cbi("polipo"), i18n("Configuration")) + entry({"admin", "services", "polipo"}, alias("admin", "services", "polipo", "config"), _("Polipo")).i18n = "polipo" + entry({"admin", "services", "polipo", "status"}, template("polipo_status"), _("Status")) + entry({"admin", "services", "polipo", "config"}, cbi("polipo"), _("Configuration")) end diff --git a/applications/luci-qos/luasrc/controller/qos.lua b/applications/luci-qos/luasrc/controller/qos.lua index af9b11499..c9eb9e5d1 100644 --- a/applications/luci-qos/luasrc/controller/qos.lua +++ b/applications/luci-qos/luasrc/controller/qos.lua @@ -11,6 +11,7 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.qos", package.seeall) function index() @@ -18,12 +19,13 @@ function index() return end - local page = entry({"admin", "network", "qos"}, cbi("qos/qos"), "QoS") + local page + + page = entry({"admin", "network", "qos"}, cbi("qos/qos"), _("QoS")) page.i18n = "qos" page.dependent = true - - - local page = entry({"mini", "network", "qos"}, cbi("qos/qosmini", {autoapply=true}), "QoS") + + page = entry({"mini", "network", "qos"}, cbi("qos/qosmini", {autoapply=true}), _("QoS")) page.i18n = "qos" page.dependent = true end diff --git a/applications/luci-radvd/luasrc/controller/radvd.lua b/applications/luci-radvd/luasrc/controller/radvd.lua index 6ed117683..09e764659 100644 --- a/applications/luci-radvd/luasrc/controller/radvd.lua +++ b/applications/luci-radvd/luasrc/controller/radvd.lua @@ -19,7 +19,7 @@ function index() return end - entry({"admin", "network", "radvd"}, cbi("radvd"), "Radvd", 61).i18n = "radvd" + entry({"admin", "network", "radvd"}, cbi("radvd"), _("Radvd"), 61).i18n = "radvd" entry({"admin", "network", "radvd", "interface"}, cbi("radvd/interface"), nil).leaf = true entry({"admin", "network", "radvd", "prefix"}, cbi("radvd/prefix"), nil).leaf = true entry({"admin", "network", "radvd", "route"}, cbi("radvd/route"), nil).leaf = true diff --git a/applications/luci-samba/luasrc/controller/samba.lua b/applications/luci-samba/luasrc/controller/samba.lua index a6d0918b7..7d531330a 100644 --- a/applications/luci-samba/luasrc/controller/samba.lua +++ b/applications/luci-samba/luasrc/controller/samba.lua @@ -12,16 +12,17 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.samba", package.seeall) function index() if not nixio.fs.access("/etc/config/samba") then return end - require("luci.i18n") - luci.i18n.loadc("samba") - - local page = entry({"admin", "services", "samba"}, cbi("samba"), luci.i18n.translate("Network Shares")) + + local page + + page = entry({"admin", "services", "samba"}, cbi("samba"), _("Network Shares")) page.i18n = "samba" page.dependent = true -end \ No newline at end of file +end diff --git a/applications/luci-splash/luasrc/controller/splash/splash.lua b/applications/luci-splash/luasrc/controller/splash/splash.lua index 27eff6579..71a61bdbf 100644 --- a/applications/luci-splash/luasrc/controller/splash/splash.lua +++ b/applications/luci-splash/luasrc/controller/splash/splash.lua @@ -1,17 +1,19 @@ module("luci.controller.splash.splash", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("freifunk") + entry({"admin", "services", "splash"}, cbi("splash/splash"), _("Client-Splash"), 90).i18n = "freifunk" + entry({"admin", "services", "splash", "splashtext" }, form("splash/splashtext"), _("Splashtext"), 10) - entry({"admin", "services", "splash"}, cbi("splash/splash"), luci.i18n.translate("Client-Splash"), 90) - entry({"admin", "services", "splash", "splashtext" }, form("splash/splashtext"), luci.i18n.translate("Splashtext"), 10) + local e + + e = node("splash") + e.target = call("action_dispatch") + e.i18n = "freifunk" - node("splash").target = call("action_dispatch") node("splash", "activate").target = call("action_activate") node("splash", "splash").target = template("splash_splash/splash") - entry({"admin", "status", "splash"}, call("action_status_admin"), "Client-Splash") + entry({"admin", "status", "splash"}, call("action_status_admin"), _("Client-Splash")).i18n = "freifunk" end function action_dispatch() diff --git a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua index ed6363f9f..5efadbd37 100644 --- a/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua +++ b/applications/luci-statistics/luasrc/controller/luci_statistics/luci_statistics.lua @@ -19,13 +19,8 @@ function index() require("nixio.fs") require("luci.util") - require("luci.i18n") require("luci.statistics.datatree") - -- load language files - luci.i18n.loadc("rrdtool") - luci.i18n.loadc("statistics") - -- get rrd data tree local tree = luci.statistics.datatree.Instance() @@ -37,32 +32,30 @@ function index() end end - local translate = luci.i18n.translate - local labels = { - s_output = translate("Output plugins"), - s_system = translate("System plugins"), - s_network = translate("Network plugins"), - - rrdtool = translate("RRDTool"), - network = translate("Network"), - unixsock = translate("UnixSock"), - csv = translate("CSV Output"), - exec = translate("Exec"), - email = translate("Email"), - cpu = translate("Processor"), - df = translate("Disk Space Usage"), - disk = translate("Disk Usage"), - irq = translate("Interrupts"), - processes = translate("Processes"), - load = translate("System Load"), - interface = translate("Interfaces"), - netlink = translate("Netlink"), - iptables = translate("Firewall"), - tcpconns = translate("TCP Connections"), - ping = translate("Ping"), - dns = translate("DNS"), - wireless = translate("Wireless") + s_output = _("Output plugins"), + s_system = _("System plugins"), + s_network = _("Network plugins"), + + rrdtool = _("RRDTool"), + network = _("Network"), + unixsock = _("UnixSock"), + csv = _("CSV Output"), + exec = _("Exec"), + email = _("Email"), + cpu = _("Processor"), + df = _("Disk Space Usage"), + disk = _("Disk Usage"), + irq = _("Interrupts"), + processes = _("Processes"), + load = _("System Load"), + interface = _("Interfaces"), + netlink = _("Netlink"), + iptables = _("Firewall"), + tcpconns = _("TCP Connections"), + ping = _("Ping"), + dns = _("DNS"), + wireless = _("Wireless") } -- our collectd menu @@ -73,21 +66,24 @@ function index() } -- create toplevel menu nodes - local st = entry({"admin", "statistics"}, call("statistics_index"), translate("Statistics"), 80) + local st = entry({"admin", "statistics"}, call("statistics_index"), _("Statistics"), 80) st.i18n = "statistics" st.index = true - entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), translate("Collectd"), 10).subindex = true + entry({"admin", "statistics", "collectd"}, cbi("luci_statistics/collectd"), _("Collectd"), 10).subindex = true -- populate collectd plugin menu local index = 1 for section, plugins in luci.util.kspairs( collectd_menu ) do - entry( + local e = entry( { "admin", "statistics", "collectd", section }, call( "statistics_" .. section .. "plugins" ), labels["s_"..section], index * 10 - ).index = true + ) + + e.index = true + e.i18n = "rrdtool" for j, plugin in luci.util.vspairs( plugins ) do _entry( @@ -101,7 +97,7 @@ function index() end -- output views - local page = entry( { "admin", "statistics", "graph" }, call("statistics_index"), translate("Graphs"), 80) + local page = entry( { "admin", "statistics", "graph" }, call("statistics_index"), _("Graphs"), 80) page.i18n = "statistics" page.setuser = "nobody" page.setgroup = "nogroup" @@ -140,10 +136,10 @@ end function statistics_outputplugins() local translate = luci.i18n.translate local plugins = { - rrdtool = translate("RRDTool"), - network = translate("Network"), - unixsock = translate("UnixSock"), - csv = translate("CSV Output") + rrdtool = _("RRDTool"), + network = _("Network"), + unixsock = _("UnixSock"), + csv = _("CSV Output") } luci.template.render("admin_statistics/outputplugins", {plugins=plugins}) @@ -152,14 +148,14 @@ end function statistics_systemplugins() local translate = luci.i18n.translate local plugins = { - exec = translate("Exec"), - email = translate("Email"), - cpu = translate("Processor"), - df = translate("Disk Space Usage"), - disk = translate("Disk Usage"), - irq = translate("Interrupts"), - processes = translate("Processes"), - load = translate("System Load"), + exec = _("Exec"), + email = _("Email"), + cpu = _("Processor"), + df = _("Disk Space Usage"), + disk = _("Disk Usage"), + irq = _("Interrupts"), + processes = _("Processes"), + load = _("System Load"), } luci.template.render("admin_statistics/systemplugins", {plugins=plugins}) @@ -168,13 +164,13 @@ end function statistics_networkplugins() local translate = luci.i18n.translate local plugins = { - interface = translate("Interfaces"), - netlink = translate("Netlink"), - iptables = translate("Firewall"), - tcpconns = translate("TCP Connections"), - ping = translate("Ping"), - dns = translate("DNS"), - wireless = translate("Wireless") + interface = _("Interfaces"), + netlink = _("Netlink"), + iptables = _("Firewall"), + tcpconns = _("TCP Connections"), + ping = _("Ping"), + dns = _("DNS"), + wireless = _("Wireless") } luci.template.render("admin_statistics/networkplugins", {plugins=plugins}) diff --git a/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua b/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua index 8625bc1ce..1dcb20ce3 100644 --- a/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua +++ b/applications/luci-tinyproxy/luasrc/controller/tinyproxy.lua @@ -20,10 +20,7 @@ function index() return end - require("luci.i18n").loadc("tinyproxy") - local i18n = luci.i18n.translate - - entry({"admin", "services", "tinyproxy"}, alias("admin", "services", "tinyproxy", "config"), "Tinyproxy").i18n = "tinyproxy" - entry({"admin", "services", "tinyproxy", "status"}, template("tinyproxy_status"), i18n("Status")) - entry({"admin", "services", "tinyproxy", "config"}, cbi("tinyproxy"), i18n("Configuration")) + entry({"admin", "services", "tinyproxy"}, alias("admin", "services", "tinyproxy", "config"), _("Tinyproxy")).i18n = "tinyproxy" + entry({"admin", "services", "tinyproxy", "status"}, template("tinyproxy_status"), _("Status")) + entry({"admin", "services", "tinyproxy", "config"}, cbi("tinyproxy"), _("Configuration")) end diff --git a/applications/luci-upnp/luasrc/controller/upnp.lua b/applications/luci-upnp/luasrc/controller/upnp.lua index fe9d3d8f5..c40493dab 100644 --- a/applications/luci-upnp/luasrc/controller/upnp.lua +++ b/applications/luci-upnp/luasrc/controller/upnp.lua @@ -12,6 +12,7 @@ You may obtain a copy of the License at $Id$ ]]-- + module("luci.controller.upnp", package.seeall) function index() @@ -21,11 +22,11 @@ function index() local page - page = entry({"admin", "services", "upnp"}, cbi("upnp/upnp"), "UPNP") + page = entry({"admin", "services", "upnp"}, cbi("upnp/upnp"), _("UPNP")) page.i18n = "upnp" page.dependent = true - page = entry({"mini", "network", "upnp"}, cbi("upnp/upnpmini", {autoapply=true}), "UPNP") + page = entry({"mini", "network", "upnp"}, cbi("upnp/upnpmini", {autoapply=true}), _("UPNP")) page.i18n = "upnp" page.dependent = true diff --git a/applications/luci-ushare/luasrc/controller/ushare.lua b/applications/luci-ushare/luasrc/controller/ushare.lua index a17c9a41e..7bbd2ddde 100644 --- a/applications/luci-ushare/luasrc/controller/ushare.lua +++ b/applications/luci-ushare/luasrc/controller/ushare.lua @@ -16,13 +16,13 @@ $Id$ module("luci.controller.ushare", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("ushare") - if not nixio.fs.access("/etc/config/ushare") then - return - end - - local page = entry({"admin", "services", "ushare"}, cbi("ushare"), luci.i18n.translate("uShare"), 60) - page.i18n = "uvc_streamer" - page.dependent = true + if not nixio.fs.access("/etc/config/ushare") then + return + end + + local page + + page = entry({"admin", "services", "ushare"}, cbi("ushare"), _("uShare"), 60) + page.i18n = "ushare" + page.dependent = true end diff --git a/applications/luci-vnstat/luasrc/controller/vnstat.lua b/applications/luci-vnstat/luasrc/controller/vnstat.lua index 605f799dc..4c10e2ad3 100644 --- a/applications/luci-vnstat/luasrc/controller/vnstat.lua +++ b/applications/luci-vnstat/luasrc/controller/vnstat.lua @@ -1,14 +1,11 @@ module("luci.controller.vnstat", package.seeall) function index() - require("luci.i18n").loadc("vnstat") - local i18n = luci.i18n.translate + entry({"admin", "status", "vnstat"}, alias("admin", "status", "vnstat", "graphs"), _("VnStat Traffic Monitor"), 90).i18n = "vnstat" + entry({"admin", "status", "vnstat", "graphs"}, template("vnstat"), _("Graphs"), 1) + entry({"admin", "status", "vnstat", "config"}, cbi("vnstat"), _("Configuration"), 2) - entry({"admin", "status", "vnstat"}, alias("admin", "status", "vnstat", "graphs"), i18n("VnStat Traffic Monitor"), 90).i18n = "vnstat" - entry({"admin", "status", "vnstat", "graphs"}, template("vnstat"), i18n("Graphs"), 1) - entry({"admin", "status", "vnstat", "config"}, cbi("vnstat"), i18n("Configuration"), 2) - - entry({"mini", "network", "vnstat"}, alias("mini", "network", "vnstat", "graphs"), i18n("VnStat Traffic Monitor"), 90).i18n = "vnstat" - entry({"mini", "network", "vnstat", "graphs"}, template("vnstat"), i18n("Graphs"), 1) - entry({"mini", "network", "vnstat", "config"}, cbi("vnstat"), i18n("Configuration"), 2) + entry({"mini", "network", "vnstat"}, alias("mini", "network", "vnstat", "graphs"), _("VnStat Traffic Monitor"), 90).i18n = "vnstat" + entry({"mini", "network", "vnstat", "graphs"}, template("vnstat"), _("Graphs"), 1) + entry({"mini", "network", "vnstat", "config"}, cbi("vnstat"), _("Configuration"), 2) end diff --git a/applications/luci-voice-core/luasrc/controller/luci_voice.lua b/applications/luci-voice-core/luasrc/controller/luci_voice.lua index 70617af6d..dc1482e35 100644 --- a/applications/luci-voice-core/luasrc/controller/luci_voice.lua +++ b/applications/luci-voice-core/luasrc/controller/luci_voice.lua @@ -11,26 +11,24 @@ You may obtain a copy of the License at ]]-- - module("luci.controller.luci_voice", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("voice_core") + local e - local e = entry({"admin", "voice"}, template("luci_voice/index") , luci.i18n.translate("Voice"), 90) + e = entry({"admin", "voice"}, template("luci_voice/index") , _("Voice"), 90) e.index = true e.i18n = "voice_core" - e = entry({"mini", "voice"}, template("luci_voice/index"), luci.i18n.translate("Voice"), 90) + e = entry({"mini", "voice"}, template("luci_voice/index"), _("Voice"), 90) e.index = true e.i18n = "voice_core" - e = entry({"mini", "voice", "phones"}, template("luci_voice/phone_index"), luci.i18n.translate("Phones"), 90) + e = entry({"mini", "voice", "phones"}, template("luci_voice/phone_index"), _("Phones"), 90) e.index = true e.i18n = "voice_core" - e = entry({"admin", "voice", "phones"}, template("luci_voice/phone_index"), luci.i18n.translate("l_v_adminphones"), 90) + e = entry({"admin", "voice", "phones"}, template("luci_voice/phone_index"), _("Phones"), 90) e.index = true e.i18n = "voice_core" diff --git a/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua b/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua index e0dccb051..8fba53b73 100644 --- a/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua +++ b/applications/luci-voice-diag/luasrc/controller/luci_voice/luci_voice_diag.lua @@ -11,15 +11,13 @@ You may obtain a copy of the License at ]]-- - module("luci.controller.luci_voice.luci_voice_diag", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("voice_diag") + local e - local e = entry({"admin", "voice", "diag"}, template("luci_voice/diag_index") , luci.i18n.translate("l_v_d_admindiag"), 90) - e.index = true - e.i18n = "voice_diag" - e.dependent = true + e = entry({"admin", "voice", "diag"}, template("luci_voice/diag_index"), _("Diagnostics"), 90) + e.index = true + e.i18n = "voice_diag" + e.dependent = true end diff --git a/applications/luci-wol/luasrc/controller/wol.lua b/applications/luci-wol/luasrc/controller/wol.lua index 429ab2ac3..bb98b6d89 100644 --- a/applications/luci-wol/luasrc/controller/wol.lua +++ b/applications/luci-wol/luasrc/controller/wol.lua @@ -1,9 +1,6 @@ module("luci.controller.wol", package.seeall) function index() - require("luci.i18n").loadc("wol") - local i18n = luci.i18n.translate - - entry({"admin", "network", "wol"}, cbi("wol"), i18n("Wake on LAN"), 90).i18n = "wol" - entry({"mini", "network", "wol"}, cbi("wol"), i18n("Wake on LAN"), 90).i18n = "wol" + entry({"admin", "network", "wol"}, cbi("wol"), _("Wake on LAN"), 90).i18n = "wol" + entry({"mini", "network", "wol"}, cbi("wol"), _("Wake on LAN"), 90).i18n = "wol" end -- cgit v1.2.3