A few smaller usability improvements

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 6ea99fe..bc07343 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -144,6 +144,10 @@ a_w_radiusport = "Radius-Port"
 a_w_apisolation = "AP-Isolation"
 a_w_apisolation1 = "Prevents Client to Client communication"
 a_w_hideessid = "Hide ESSID"
 a_w_apisolation = "AP-Isolation"
 a_w_apisolation1 = "Prevents Client to Client communication"
 a_w_hideessid = "Hide ESSID"

+a_w_ap = "Access Point"
+a_w_adhoc = "Ad-Hoc"
+a_w_client = "Client"
+a_w_wds = "WDS"

 
 dhcp_desc = "Dnsmasq is a combined DHCP-Server and DNS-Forwarder for NAT firewalls"
 dhcp_dnsmasq_domainneeded = "Domain required"
 
 dhcp_desc = "Dnsmasq is a combined DHCP-Server and DNS-Forwarder for NAT firewalls"
 dhcp_dnsmasq_domainneeded = "Domain required"


@@ -233,4 +237,12 @@ a_n_r_target1 = "host-IP or network"
 a_n_r_netmask1 = "if target is a network"
 
 m_n_local = "Local Network"
 a_n_r_netmask1 = "if target is a network"
 
 m_n_local = "Local Network"

-m_n_inet  = "Internet Connection"
\ No newline at end of file
+m_n_inet  = "Internet Connection"
+m_n_route = "Route"
+m_n_brdige = "Bridge"
+
+m_w_ap = "Provide (Access Point)"
+m_w_adhoc = "Independent (Ad-Hoc)"
+m_w_client = "Join (Client)"
+m_w_wds = "Distributed (WDS)"
+m_w_clientmode = "Clientmode"
\ No newline at end of file

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index b29c4be..3d986be 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -141,6 +141,10 @@ Die Unterstützung von virtuellen Adaptern ermöglicht auch den Einsatz als Wire
 mehreren Netzwerken gleichzeitig auf einem Gerät.]]
 a_w_wifi3 = [[Es werden Managed, Client, Ad-Hoc und WDS-Modus unterstützt sowie WPA und WPA2-Verschlüsselung zur gesicherten
 Kommunikation.]]
 mehreren Netzwerken gleichzeitig auf einem Gerät.]]
 a_w_wifi3 = [[Es werden Managed, Client, Ad-Hoc und WDS-Modus unterstützt sowie WPA und WPA2-Verschlüsselung zur gesicherten
 Kommunikation.]]

+a_w_ap = "Access Point"
+a_w_adhoc = "Ad-Hoc"
+a_w_client = "Client"
+a_w_wds = "WDS"

 accept = [[Annehmen]]
 aliases = [[Aliasse]]
 bitrate = [[Bitrate]]
 accept = [[Annehmen]]
 aliases = [[Aliasse]]
 bitrate = [[Bitrate]]


@@ -246,4 +250,12 @@ uci_applied = [[Die folgenden Änderungen wurden übernommen]]
 uci_reverted = [[Die folgenden Änderungen wurden verworfen]]
 
 m_n_local = "Lokales Netz"
 uci_reverted = [[Die folgenden Änderungen wurden verworfen]]
 
 m_n_local = "Lokales Netz"

-m_n_inet  = "Internetverbindung"
\ No newline at end of file
+m_n_inet  = "Internetverbindung"
+m_n_route = "Weiterleiten"
+m_n_bridge = "Überbrücken"
+
+m_w_ap = "Anbieten (Access Point)"
+m_w_adhoc = "Unabhängig (Ad-Hoc)"
+m_w_client = "Einklinken (Client)"
+m_w_wds = "Verteilen (WDS)"
+m_w_clientmode = "Verbindungsmodus"
\ No newline at end of file

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 f0379b3..ae4f84b 100644 (file)
--- 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"))
        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
 
 
 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 d75ead2..f612e9d 100644 (file)
--- 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"))
 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
 
 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("network", "wan", "type", "bridge")

-               luci.model.uci.set("wireless", section, "network", "wan")
+               luci.model.uci.save("network")
+
+               self.map:set(section, "network", "wan")

        else
        else

-               luci.model.uci.delete("network", "wan", "type")
-               luci.model.uci.set("wireless", section, "network", "lan")
+               self.map:set(section, "network", "lan")

        end
        end

-       luci.model.uci.save("network")
+

        return ListValue.write(self, section, value)
 end
 
        return ListValue.write(self, section, value)
 end