luci-0.11: merge outstanding trunk changes

[project/luci.git] / applications / luci-voice-core / luasrc / controller / luci_voice.lua

diff --git a/applications/luci-voice-core/luasrc/controller/luci_voice.lua b/applications/luci-voice-core/luasrc/controller/luci_voice.lua
index 4d8873e9f5f356866b95c1d989a08e79da0d07f1..728afb6a459840356e4a37bc18d47649f454ed98 100644 (file)
--- a/applications/luci-voice-core/luasrc/controller/luci_voice.lua
+++ b/applications/luci-voice-core/luasrc/controller/luci_voice.lua
@@ -11,27 +11,21 @@ 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("l_v_adminvoice", "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("l_v_minivoice", "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("l_v_miniphones"), 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"
 
 end