diff options
Diffstat (limited to 'modules')
10 files changed, 14 insertions, 19 deletions
diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm index f39f620a8..7ee11a0a2 100644 --- a/modules/admin-core/luasrc/view/sysauth.htm +++ b/modules/admin-core/luasrc/view/sysauth.htm @@ -12,8 +12,8 @@ You may obtain a copy of the License at $Id$ -%> + <%+header%> -<% luci.i18n.loadc("sysauth") %> <form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>"> <div class="cbi-map"> diff --git a/modules/admin-full/luasrc/controller/admin/index.lua b/modules/admin-full/luasrc/controller/admin/index.lua index 9611f5ae7..3e7b038db 100644 --- a/modules/admin-full/luasrc/controller/admin/index.lua +++ b/modules/admin-full/luasrc/controller/admin/index.lua @@ -14,7 +14,7 @@ $Id$ module("luci.controller.admin.index", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate local root = node() @@ -23,13 +23,12 @@ function index() root.index = true end - entry({"about"}, template("about")).i18n = "admin-core" + entry({"about"}, template("about")) local page = node("admin") page.target = alias("admin", "index") page.title = i18n("Administration") page.order = 10 - page.i18n = "admin-core" page.sysauth = "root" page.sysauth_authenticator = "htmlauth" page.ucidata = true diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index faf4f285b..a5cc2c284 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -30,16 +30,13 @@ function index() page.order = 20 local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15) - page.i18n = "wifi" page.leaf = true page.subindex = true local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16) - page.i18n = "wifi" page.leaf = true local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16) - page.i18n = "wifi" page.leaf = true local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10) diff --git a/modules/admin-full/luasrc/controller/admin/services.lua b/modules/admin-full/luasrc/controller/admin/services.lua index ee5e9b3d6..d2fab8ad0 100644 --- a/modules/admin-full/luasrc/controller/admin/services.lua +++ b/modules/admin-full/luasrc/controller/admin/services.lua @@ -14,7 +14,7 @@ $Id$ module("luci.controller.admin.services", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate local page = node("admin", "services", "crontab") diff --git a/modules/admin-full/luasrc/controller/admin/status.lua b/modules/admin-full/luasrc/controller/admin/status.lua index 27f1f9437..55bba2f38 100644 --- a/modules/admin-full/luasrc/controller/admin/status.lua +++ b/modules/admin-full/luasrc/controller/admin/status.lua @@ -14,7 +14,7 @@ $Id$ module("luci.controller.admin.status", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 31f4361e4..1a19b143d 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -15,7 +15,7 @@ $Id$ module("luci.controller.admin.system", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua index f50858f4d..81c0846bf 100644 --- a/modules/admin-mini/luasrc/controller/mini/index.lua +++ b/modules/admin-mini/luasrc/controller/mini/index.lua @@ -16,7 +16,7 @@ $Id$ module("luci.controller.mini.index", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate local root = node() @@ -25,10 +25,9 @@ function index() root.index = true end - entry({"about"}, template("about")).i18n = "admin-core" + entry({"about"}, template("about")) local page = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10) - page.i18n = "admin-core" page.sysauth = "root" page.sysauth_authenticator = "htmlauth" page.index = true @@ -49,4 +48,4 @@ function action_logout() luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url()) luci.http.redirect(luci.dispatcher.build_url()) -end
\ No newline at end of file +end diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/admin-mini/luasrc/controller/mini/network.lua index 25f29d9db..22162adc5 100644 --- a/modules/admin-mini/luasrc/controller/mini/network.lua +++ b/modules/admin-mini/luasrc/controller/mini/network.lua @@ -16,11 +16,11 @@ $Id$ module("luci.controller.mini.network", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate entry({"mini", "network"}, alias("mini", "network", "index"), i18n("Network"), 20).index = true entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), i18n("General"), 1) - entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), i18n("Wifi"), 10).i18n="wifi" + entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), i18n("Wifi"), 10) entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), "DHCP", 20) -end
\ No newline at end of file +end diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua index f21a9ef96..93f113a32 100644 --- a/modules/admin-mini/luasrc/controller/mini/system.lua +++ b/modules/admin-mini/luasrc/controller/mini/system.lua @@ -16,7 +16,7 @@ $Id$ module("luci.controller.mini.system", package.seeall) function index() - luci.i18n.loadc("admin-core") + luci.i18n.loadc("base") local i18n = luci.i18n.translate entry({"mini", "system"}, alias("mini", "system", "index"), i18n("System"), 40).index = true diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 52b37dc6a..e4f34714d 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -47,7 +47,7 @@ function index() page.target = form("freifunk/public_status") page.title = i18n("Overview") page.order = 20 - page.i18n = "admin-core" + page.i18n = "base" page.setuser = false page.setgroup = false |