X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_join.htm;h=6ed4627dc0bec5156b5d4c80249ab74f33addbcd;hp=3963a5ae283c28d82797f4778cecb3dbe8e90218;hb=a50452e3e37bd3c79b4e69447420c8cd4cc2388b;hpb=4d3ddb03a308629abc4f9c37686c5d2351ce5950;ds=sidebyside

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
index 3963a5ae2..6ed4627dc 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -52,12 +52,12 @@ $Id$
 	function format_wifi_encryption(info)
 		if info.wep == true and not info.wpa_version then
 			return "WEP"
-		elseif info.wpa_version then
+		elseif info.wpa then
 			return "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" % {
 				table.concat(info.pair_ciphers, ", "),
 				table.concat(info.group_ciphers, ", "),
-				(info.wpa_version == 3) and "mixed WPA/WPA2"
-					or (info.wpa_version == 2 and "WPA2" or "WPA"),
+				(info.wpa == 3) and "mixed WPA/WPA2"
+					or (info.wpa == 2 and "WPA2" or "WPA"),
 				table.concat(info.auth_suites, ", ")
 			}
 		else
@@ -71,7 +71,7 @@ $Id$
 
 <%+header%>
 
-<h2><a id="content" name="content"><%:a_s_iw_scan Wireless Scan%></a></h2>
+<h2><a id="content" name="content"><%:Join Network: Wireless Scan%></a></h2>
 
 <div class="cbi-map">
 	<fieldset class="cbi-section">
@@ -100,8 +100,8 @@ $Id$
 						<input type="hidden" name="bssid" value="<%=net.bssid%>" />
 						<input type="hidden" name="channel" value="<%=net.channel%>" />
 						<input type="hidden" name="wep" value="<%=net.wep and 1 or 0%>" />
-						<% if net.wpa_version then %>
-						<input type="hidden" name="wpa_version" value="<%=net.wpa_version%>" />
+						<% if net.wpa then %>
+						<input type="hidden" name="wpa_version" value="<%=net.wpa%>" />
 						<% for _, v in ipairs(net.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>" />
 						<% end; for _, v in ipairs(net.group_ciphers) do %><input type="hidden" name="wpa_group" value="<%=v%>" />
 						<% end; for _, v in ipairs(net.pair_ciphers) do %><input type="hidden" name="wpa_pairwise" value="<%=v%>" />
@@ -118,11 +118,11 @@ $Id$
 </div>
 <div class="cbi-page-actions right">
 	<form class="inline" action="<%=luci.dispatcher.build_url("admin/network/wireless")%>" method="get">
-		<input class="cbi-button-reset" type="submit" value="<%:a_s_iw_back_overview Back to overview%>" />
+		<input class="cbi-button-reset" type="submit" value="<%:Back to overview%>" />
 	</form>
 	<form class="inline" action="<%=REQUEST_URI%>" method="get">
 		<input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-		<input class="cbi-input-find" type="submit" value="<%:a_s_iw_scan_repeat Repeat scan%>" />
+		<input class="cbi-input-find" type="submit" value="<%:Repeat scan%>" />
 	</form>
 </div>