Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

all: remove references to old i18n files

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-11-01 14:24:04 +00:00
parent c0ba2e06c6
commit f5a760168b
13 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/cbi2uvl.lua
View file

@ -23,9 +23,7 @@ if not arg[1] then
os.exit(1) os.exit(1)
end end
i18n.load("default", "en") i18n.load("base", "en")
i18n.load("admin-core", "en")
i18n.load("wifi", "en")
if arg[2] then if arg[2] then
i18n.load(arg[2], "en") i18n.load(arg[2], "en")

3
libs/cbi/luasrc/cbi.lua
View file

@ -74,8 +74,7 @@ function load(cbimap, ...)
assert(func, err) assert(func, err)
luci.i18n.loadc("cbi") luci.i18n.loadc("base")
luci.i18n.loadc("uvl")
local env = { local env = {
translate=i18n.translate, translate=i18n.translate,

2
libs/web/luasrc/dispatcher.lua
View file

@ -475,7 +475,7 @@ function createtree()
ctx.modifiers = modi ctx.modifiers = modi
-- Load default translation -- Load default translation
require "luci.i18n".loadc("default") require "luci.i18n".loadc("base")
local scope = setmetatable({}, {__index = luci.dispatcher}) local scope = setmetatable({}, {__index = luci.dispatcher})

2
modules/admin-core/luasrc/view/sysauth.htm
View file

@ -12,8 +12,8 @@ You may obtain a copy of the License at
$Id$ $Id$
-%> -%>
<%+header%> <%+header%>
<% luci.i18n.loadc("sysauth") %>
<form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>"> <form method="post" action="<%=luci.http.getenv("REQUEST_URI")%>">
<div class="cbi-map"> <div class="cbi-map">

5
modules/admin-full/luasrc/controller/admin/index.lua
View file

@ -14,7 +14,7 @@ $Id$
module("luci.controller.admin.index", package.seeall) module("luci.controller.admin.index", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
local root = node() local root = node()
@ -23,13 +23,12 @@ function index()
root.index = true root.index = true
end end
entry({"about"}, template("about")).i18n = "admin-core" entry({"about"}, template("about"))
local page = node("admin") local page = node("admin")
page.target = alias("admin", "index") page.target = alias("admin", "index")
page.title = i18n("Administration") page.title = i18n("Administration")
page.order = 10 page.order = 10
page.i18n = "admin-core"
page.sysauth = "root" page.sysauth = "root"
page.sysauth_authenticator = "htmlauth" page.sysauth_authenticator = "htmlauth"
page.ucidata = true page.ucidata = true

3
modules/admin-full/luasrc/controller/admin/network.lua
View file

@ -30,16 +30,13 @@ function index()
page.order = 20 page.order = 20
local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15) 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.leaf = true
page.subindex = true page.subindex = true
local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16) local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16)
page.i18n = "wifi"
page.leaf = true page.leaf = true
local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16) local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16)
page.i18n = "wifi"
page.leaf = true page.leaf = true
local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10) local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)

2
modules/admin-full/luasrc/controller/admin/services.lua
View file

@ -14,7 +14,7 @@ $Id$
module("luci.controller.admin.services", package.seeall) module("luci.controller.admin.services", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
local page = node("admin", "services", "crontab") local page = node("admin", "services", "crontab")

2
modules/admin-full/luasrc/controller/admin/status.lua
View file

@ -14,7 +14,7 @@ $Id$
module("luci.controller.admin.status", package.seeall) module("luci.controller.admin.status", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true entry({"admin", "status"}, template("admin_status/index"), i18n("Status"), 20).index = true

2
modules/admin-full/luasrc/controller/admin/system.lua
View file

@ -15,7 +15,7 @@ $Id$
module("luci.controller.admin.system", package.seeall) module("luci.controller.admin.system", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true

7
modules/admin-mini/luasrc/controller/mini/index.lua
View file

@ -16,7 +16,7 @@ $Id$
module("luci.controller.mini.index", package.seeall) module("luci.controller.mini.index", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
local root = node() local root = node()
@ -25,10 +25,9 @@ function index()
root.index = true root.index = true
end end
entry({"about"}, template("about")).i18n = "admin-core" entry({"about"}, template("about"))
local page = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10) local page = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10)
page.i18n = "admin-core"
page.sysauth = "root" page.sysauth = "root"
page.sysauth_authenticator = "htmlauth" page.sysauth_authenticator = "htmlauth"
page.index = true page.index = true
@ -49,4 +48,4 @@ function action_logout()
luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url()) luci.http.header("Set-Cookie", "sysauth=; path=" .. dsp.build_url())
luci.http.redirect(luci.dispatcher.build_url()) luci.http.redirect(luci.dispatcher.build_url())
end end

6
modules/admin-mini/luasrc/controller/mini/network.lua
View file

@ -16,11 +16,11 @@ $Id$
module("luci.controller.mini.network", package.seeall) module("luci.controller.mini.network", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
entry({"mini", "network"}, alias("mini", "network", "index"), i18n("Network"), 20).index = true 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", "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) entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), "DHCP", 20)
end end

2
modules/admin-mini/luasrc/controller/mini/system.lua
View file

@ -16,7 +16,7 @@ $Id$
module("luci.controller.mini.system", package.seeall) module("luci.controller.mini.system", package.seeall)
function index() function index()
luci.i18n.loadc("admin-core") luci.i18n.loadc("base")
local i18n = luci.i18n.translate local i18n = luci.i18n.translate
entry({"mini", "system"}, alias("mini", "system", "index"), i18n("System"), 40).index = true entry({"mini", "system"}, alias("mini", "system", "index"), i18n("System"), 40).index = true

2
modules/freifunk/luasrc/controller/freifunk/freifunk.lua
View file

@ -47,7 +47,7 @@ function index()
page.target = form("freifunk/public_status") page.target = form("freifunk/public_status")
page.title = i18n("Overview") page.title = i18n("Overview")
page.order = 20 page.order = 20
page.i18n = "admin-core" page.i18n = "base"
page.setuser = false page.setuser = false
page.setgroup = false page.setgroup = false