all: remove references to old i18n files

diff --git a/build/cbi2uvl.lua b/build/cbi2uvl.lua
index e1d0c150d4acd35df925f2f20a4c0407fa9905b2..7fe8ef5744e1057f5e63149a9f765c1bbaced856 100755 (executable)
--- a/build/cbi2uvl.lua
+++ b/build/cbi2uvl.lua
@@ -23,9 +23,7 @@ if not arg[1] then
        os.exit(1)
 end
 
-i18n.load("default", "en")
-i18n.load("admin-core", "en")
-i18n.load("wifi", "en")
+i18n.load("base", "en")
 
 if arg[2] then
        i18n.load(arg[2], "en")

diff --git a/libs/cbi/luasrc/cbi.lua b/libs/cbi/luasrc/cbi.lua
index 9a88a2b366446bab5cecc1846597b6dcee41d46c..bfdfd699998eecbb5d0682e1926a4ad8b1c9d4e4 100644 (file)
--- a/libs/cbi/luasrc/cbi.lua
+++ b/libs/cbi/luasrc/cbi.lua
@@ -74,8 +74,7 @@ function load(cbimap, ...)
 
        assert(func, err)
 
-       luci.i18n.loadc("cbi")
-       luci.i18n.loadc("uvl")
+       luci.i18n.loadc("base")
 
        local env = {
                translate=i18n.translate,

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 6445c124ed5ee0fc076bccad528f7577ddcf7290..e3d7ec974806449a1299a4652f85998fc83440e0 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -475,7 +475,7 @@ function createtree()
        ctx.modifiers = modi
 
        -- Load default translation
-       require "luci.i18n".loadc("default")
+       require "luci.i18n".loadc("base")
 
        local scope = setmetatable({}, {__index = luci.dispatcher})
 

diff --git a/modules/admin-core/luasrc/view/sysauth.htm b/modules/admin-core/luasrc/view/sysauth.htm
index f39f620a845dd726eefee798d5e707e92ca6a1d2..7ee11a0a285aae3f16913a24fb3bbcb6dd81853e 100644 (file)
--- 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 9611f5ae7e55dc862222bbdd7890a8203427d330..3e7b038dbd23fc907359915804d34aeaedbca1d4 100644 (file)
--- 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 faf4f285b4bf015cafbf8b94ef5e249d873bbc0f..a5cc2c28498287ceacee90d9f32531b3a27c20af 100644 (file)
--- 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 ee5e9b3d66377d0a2237c5cdb43a4e41fc776ef8..d2fab8ad0a7aad791ff194b7acaddce3ff58d658 100644 (file)
--- 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 27f1f943782b06a9a14642d307afdf4665f8be26..55bba2f3811fa4d0f359b27215534c4bad34578c 100644 (file)
--- 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 31f4361e46cf02607d4ccc1d66e794fd1bd1a54f..1a19b143d8f3a90dbe7b0196e4214c4604627576 100644 (file)
--- 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 f50858f4d719c69ccd274b1567ffc463ec0be92b..81c0846bfab39c039ebfe72489f34189a4a8a550 100644 (file)
--- 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 25f29d9db837bdcda8230da55c5895c736f3d30d..22162adc564b135234dd0a8b9820dc70e4cb6eda 100644 (file)
--- 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 f21a9ef96ebcc4335723bcad6f26888e3ff9b030..93f113a329ffb07a1399466ff4317aa072b178f8 100644 (file)
--- 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 52b37dc6a164ef3c12da219570cc8897f5df456c..e4f34714d64c7a40b3a7558b4f5604c8f010b9ef 100644 (file)
--- 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