From 4142839e0d3196cf74fdeee80de5e01d84ffb861 Mon Sep 17 00:00:00 2001
From: Dirk Brenken <dev@brenken.org>
Date: Mon, 31 Jul 2017 08:05:54 +0200
Subject: [PATCH] luci-app-travelmate: bugfixes

* fix interface default value on overview page
* fix re-ordering of wireless stations
* added translation fix by INAGAKI Hiroshi <musashino.open@gmail.com>

Signed-off-by: Dirk Brenken <dev@brenken.org>
---
 .../luasrc/model/cbi/travelmate/overview_tab.lua         | 2 +-
 .../luasrc/view/travelmate/stations.htm                  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index aa508f521..12cb72cbe 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -90,7 +90,7 @@ end
 o3 = s:option(Value, "trm_iface", translate("Uplink / Trigger interface"),
 	translate("Name of the uplink interface that triggers travelmate processing in 'manual' mode."))
 o3.datatype = "and(uciname,rangelength(3,15))"
-o3.default = "trm_wwan"
+o3.default = trmiface
 o3.rmempty = false
 
 o4 = s:option(Value, "trm_triggerdelay", translate("Trigger delay"),
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
index f1c6be162..d8ca96607 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm
@@ -14,7 +14,7 @@ This is free software, licensed under the Apache License, Version 2.0
 <div class="cbi-map">
 <h2 name="content"><%:Wireless Stations%></h2>
 <div class="cbi-map-descr">
-  <%:Provides an overview of all configured uplinks for the travelmate interface (%><%=trmiface%><%:). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.%>
+  <%=translatef("Provides an overview of all configured uplinks for the travelmate interface (%s). You can edit, delete or re-order existing uplinks or scan for a new one. The currently used uplink is emphasized in blue.", trmiface)%>
 </div>
 
 <fieldset class="cbi-section">
@@ -26,8 +26,11 @@ This is free software, licensed under the Apache License, Version 2.0
       <th class="cbi-section-table-cell" style="text-align:center" colspan="2"><%:Actions%></th>
     </tr>
 <%
-    local pos = 1
-    uci:foreach("wireless", "wifi-iface", function(s)
+  local pos = -1
+  uci:foreach("wireless", "wifi-device", function(s)
+    pos = pos + 1
+  end)
+  uci:foreach("wireless", "wifi-iface", function(s)
     pos = pos + 1
     local section = s['.name']
     local device = s.device or ""
-- 
2.25.1