From 5d92f125cd074ef3ba16ef274cec06eac48bde21 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 27 Apr 2018 15:35:02 +0200
Subject: [PATCH] gluon-web-network: remove legacy option for wired mesh
---
package/gluon-web-network/i18n/de.po | 6 ------
package/gluon-web-network/i18n/fr.po | 6 ------
.../gluon-web-network/i18n/gluon-web-network.pot | 6 ------
.../gluon/config-mode/model/admin/network.lua | 16 ----------------
4 files changed, 34 deletions(-)
diff --git a/package/gluon-web-network/i18n/de.po b/package/gluon-web-network/i18n/de.po
index 15bcbc766..1170cbb05 100644
--- a/package/gluon-web-network/i18n/de.po
+++ b/package/gluon-web-network/i18n/de.po
@@ -55,11 +55,5 @@ msgstr "Statisch"
msgid "Static DNS servers"
msgstr "Statische DNS-Server"
-msgid "Use legacy mode for LAN meshing"
-msgstr "Veralteter Modus (LAN-Mesh)"
-
-msgid "Use legacy mode for WAN meshing"
-msgstr "Veralteter Modus (WAN-Mesh)"
-
msgid "WAN connection"
msgstr "WAN-Verbindung"
diff --git a/package/gluon-web-network/i18n/fr.po b/package/gluon-web-network/i18n/fr.po
index e2ed57c69..c67531d8d 100644
--- a/package/gluon-web-network/i18n/fr.po
+++ b/package/gluon-web-network/i18n/fr.po
@@ -55,11 +55,5 @@ msgstr "Statique"
msgid "Static DNS servers"
msgstr "Adresse DNS statique"
-msgid "Use legacy mode for LAN meshing"
-msgstr ""
-
-msgid "Use legacy mode for WAN meshing"
-msgstr ""
-
msgid "WAN connection"
msgstr "Connexion WAN"
diff --git a/package/gluon-web-network/i18n/gluon-web-network.pot b/package/gluon-web-network/i18n/gluon-web-network.pot
index 2259a7dac..75f625da9 100644
--- a/package/gluon-web-network/i18n/gluon-web-network.pot
+++ b/package/gluon-web-network/i18n/gluon-web-network.pot
@@ -46,11 +46,5 @@ msgstr ""
msgid "Static DNS servers"
msgstr ""
-msgid "Use legacy mode for LAN meshing"
-msgstr ""
-
-msgid "Use legacy mode for WAN meshing"
-msgstr ""
-
msgid "WAN connection"
msgstr ""
diff --git a/package/gluon-web-network/luasrc/lib/gluon/config-mode/model/admin/network.lua b/package/gluon-web-network/luasrc/lib/gluon/config-mode/model/admin/network.lua
index 5a6c3b578..7f723ee53 100644
--- a/package/gluon-web-network/luasrc/lib/gluon/config-mode/model/admin/network.lua
+++ b/package/gluon-web-network/luasrc/lib/gluon/config-mode/model/admin/network.lua
@@ -83,14 +83,6 @@ function mesh_wan:write(data)
uci:set("network", "mesh_wan", "disabled", not data)
end
-local mesh_wan_legacy = s:option(Flag, "mesh_wan_legacy", translate("Use legacy mode for WAN meshing"))
-mesh_wan_legacy.default = mesh_wan.default and uci:get_bool("network", "mesh_wan", "legacy")
-mesh_wan_legacy:depends(mesh_wan, true)
-
-function mesh_wan_legacy:write(data)
- uci:set("network", "mesh_wan", "legacy", data)
-end
-
if sysconfig.lan_ifname then
local s = f:section(Section)
@@ -112,14 +104,6 @@ if sysconfig.lan_ifname then
uci:set_list("network", "client", "ifname", interfaces)
end
-
- local mesh_lan_legacy = s:option(Flag, "mesh_lan_legacy", translate("Use legacy mode for LAN meshing"))
- mesh_lan_legacy.default = mesh_lan.default and uci:get_bool("network", "mesh_lan", "legacy")
- mesh_lan_legacy:depends(mesh_lan, true)
-
- function mesh_lan_legacy:write(data)
- uci:set("network", "mesh_lan", "legacy", data)
- end
end
local section
--
GitLab