luci-mod-admin-full/mini: replace Wifi with Wireless in menus

Replace the menu item "Wifi" by "Wireless",
which is already used for page and section headings

This closes #695

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
index aa533cb70b1262c6fdb6ba3b61e5b260e4adc167..3b5f3eb8de89cfd3a96b7bd978583899b42930a0 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
@@ -61,7 +61,7 @@ function index()
                        page = entry({"admin", "network", "wireless_shutdown"}, post("wifi_shutdown"), nil)
                        page.leaf = true
 
-                       page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+                       page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15)
                        page.leaf = true
                        page.subindex = true
 

diff --git a/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
index 0b74c41ec4848b0b9a5215999a2964514215f526..92506e54f2bc30f1a1ec92e58c3077dc2dafa9dc 100644 (file)
--- a/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
+++ b/modules/luci-mod-admin-mini/luasrc/controller/mini/network.lua
@@ -7,6 +7,6 @@ module("luci.controller.mini.network", package.seeall)
 function index()
        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", "wifi"}, cbi("mini/wifi", {autoapply=true}), _("Wireless"), 10)
        entry({"mini", "network", "dhcp"}, cbi("mini/dhcp", {autoapply=true}), _("DHCP"), 20)
 end

diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
index 0729c44393e41ba3d1174fb6ac31be2f1fc5de37..19952cd5dce9045fd6668a78134b54e19f8ca9c6 100644 (file)
--- a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -33,7 +33,7 @@ wlcursor:foreach("wireless", "wifi-device",
 
 -- Main Map --
 
-m = Map("wireless", translate("Wifi"), translate("Here you can configure installed wifi devices."))
+m = Map("wireless", translate("Wireless"), translate("Here you can configure installed wifi devices."))
 m:chain("network")