applications, modules: remove i18n handling from controller modules as it moved to the themes now

3 files changed, 15 insertions, 24 deletions

diff --git a/modules/admin-mini/luasrc/controller/mini/index.lua b/modules/admin-mini/luasrc/controller/mini/index.lua
index 81c0846bf..9d6a38ed4 100644
--- a/modules/admin-mini/luasrc/controller/mini/index.lua
+++ b/modules/admin-mini/luasrc/controller/mini/index.lua
@@ -16,9 +16,6 @@ $Id$
 module("luci.controller.mini.index", package.seeall)
 
 function index()
-	luci.i18n.loadc("base")
-	local i18n = luci.i18n.translate
-
 	local root = node()
 	if not root.lock then
 		root.target = alias("mini")
@@ -27,15 +24,15 @@ function index()
 	
 	entry({"about"}, template("about"))
 	
-	local page   = entry({"mini"}, alias("mini", "index"), i18n("Essentials"), 10)
+	local page   = entry({"mini"}, alias("mini", "index"), _("Essentials"), 10)
 	page.sysauth = "root"
 	page.sysauth_authenticator = "htmlauth"
 	page.index = true
 	
-	entry({"mini", "index"}, alias("mini", "index", "index"), i18n("Overview"), 10).index = true
-	entry({"mini", "index", "index"}, form("mini/index"), i18n("General"), 1).ignoreindex = true
-	entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), i18n("Settings"), 10)
-	entry({"mini", "index", "logout"}, call("action_logout"), i18n("Logout"))
+	entry({"mini", "index"}, alias("mini", "index", "index"), _("Overview"), 10).index = true
+	entry({"mini", "index", "index"}, form("mini/index"), _("General"), 1).ignoreindex = true
+	entry({"mini", "index", "luci"}, cbi("mini/luci", {autoapply=true}), _("Settings"), 10)
+	entry({"mini", "index", "logout"}, call("action_logout"), _("Logout"))
 end
 
 function action_logout()
diff --git a/modules/admin-mini/luasrc/controller/mini/network.lua b/modules/admin-mini/luasrc/controller/mini/network.lua
index 22162adc5..8b9356dd6 100644
--- a/modules/admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/admin-mini/luasrc/controller/mini/network.lua
@@ -16,11 +16,8 @@ $Id$
 module("luci.controller.mini.network", package.seeall)
 
 function index()
-	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)
-	entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), "DHCP", 20)
+	entry({"mini", "network"}, alias("mini", "network", "index"), _("Network"), 20).index = true
+	entry({"mini", "network", "index"}, cbi("mini/network", {autoapply=true}), _("General"), 1)
+	entry({"mini", "network", "wifi"}, cbi("mini/wifi", {autoapply=true}), _("Wifi"), 10)
+	entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), _("DHCP"), 20)
 end
diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 2559ac16c..519c15bc6 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -16,15 +16,12 @@ $Id$
 module("luci.controller.mini.system", package.seeall)
 
 function index()
-	luci.i18n.loadc("base")
-	local i18n = luci.i18n.translate
-
-	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("System"), 40).index = true
-	entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), i18n("General"), 1)
-	entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("Admin Password"), 10)
-	entry({"mini", "system", "backup"}, call("action_backup"), i18n("Backup / Restore"), 80)
-	entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("Flash Firmware"), 90)
-	entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("Reboot"), 100)
+	entry({"mini", "system"}, alias("mini", "system", "index"), _("System"), 40).index = true
+	entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), _("General"), 1)
+	entry({"mini", "system", "passwd"}, form("mini/passwd"), _("Admin Password"), 10)
+	entry({"mini", "system", "backup"}, call("action_backup"), _("Backup / Restore"), 80)
+	entry({"mini", "system", "upgrade"}, call("action_upgrade"), _("Flash Firmware"), 90)
+	entry({"mini", "system", "reboot"}, call("action_reboot"), _("Reboot"), 100)
 end
 
 function action_backup()