A few smaller usability improvements

2 files changed, 18 insertions, 11 deletions

diff --git a/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua
index f0379b370..ae4f84b9f 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_wifi/networks.lua
@@ -35,10 +35,10 @@ luci.model.uci.foreach("network", "interface",
 	end)
 
 mode = s:option(ListValue, "mode", translate("mode"))
-mode:value("ap", "Access Point")
-mode:value("adhoc", "Ad-Hoc")
-mode:value("sta", "Client")
-mode:value("wds", "WDS")
+mode:value("ap", translate("a_w_ap"))
+mode:value("adhoc", translate("a_w_adhoc"))
+mode:value("sta", translate("a_w_client"))
+mode:value("wds", translate("a_w_wds"))
 
 s:option(Value, "bssid", "BSSID").optional = true
 
diff --git a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
index d75ead282..f612e9d53 100644
--- a/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -50,19 +50,26 @@ else
 end
 
 mode = s:option(ListValue, "mode", translate("mode"))
-mode:value("ap", "Access Point")
-mode:value("adhoc", "Ad-Hoc")
-mode:value("sta", "Client")
+mode:value("ap", translate("m_w_ap"))
+mode:value("adhoc", translate("m_w_adhoc"))
+mode:value("sta", translate("m_w_client"))
 
 function mode.write(self, section, value)
 	if value == "sta" then
+		-- ToDo: Move this away
+		if not luci.model.uci.get("network", "wan") then
+			luci.model.uci.set("network", "wan", "interface")
+			luci.model.uci.set("network", "wan", "proto", "none")
+		end
+
 		luci.model.uci.set("network", "wan", "type", "bridge")
-		luci.model.uci.set("wireless", section, "network", "wan")
+		luci.model.uci.save("network")
+
+		self.map:set(section, "network", "wan")
 	else
-		luci.model.uci.delete("network", "wan", "type")
-		luci.model.uci.set("wireless", section, "network", "lan")
+		self.map:set(section, "network", "lan")
 	end
-	luci.model.uci.save("network")
+
 	return ListValue.write(self, section, value)
 end