all: change most translate statements to new format, some need manual cleanup

[project/luci.git] / applications / luci-splash / luasrc / view / admin_status / splash.htm

diff --git a/applications/luci-splash/luasrc/view/admin_status/splash.htm b/applications/luci-splash/luasrc/view/admin_status/splash.htm
index 9939520..11af7f5 100644 (file)
--- a/applications/luci-splash/luasrc/view/admin_status/splash.htm
+++ b/applications/luci-splash/luasrc/view/admin_status/splash.htm
@@ -18,6 +18,8 @@ local utl = require "luci.util"
 local ipt = require "luci.sys.iptparser".IptParser()
 local uci = require "luci.model.uci".cursor_state()
 local wat = require "luci.tools.webadmin"
+local fs  = require "nixio.fs"
+
 local clients = { }
 local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime") or 1) * 60 * 60
 local leasefile = "/tmp/dhcp.leases"
@@ -94,7 +96,7 @@ uci:foreach("luci_splash", "blacklist",
                end
        end)            
 
-if luci.fs.access(leasefile) then
+if fs.access(leasefile) then
        for l in io.lines(leasefile) do
                local time, mac, ip, name = l:match("^(%d+) (%S+) (%S+) (%S+)")
                if time and mac and ip then
@@ -156,12 +158,12 @@ end
                                                        count = count + 1
                                -%>
                                        <tr class="cbi-section-table-row cbi-rowstyle-<%=2-(count%2)%>">
-                                               <td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("ff_splash_unknown", "unknown") .. "</em>"%></td>
-                                               <td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("ff_splash_unknown", "unknown") .. "</em>"%></td>
+                                               <td class="cbi-section-table-cell"><%=c.hostname or "<em>" .. translate("unknown") .. "</em>"%></td>
+                                               <td class="cbi-section-table-cell"><%=c.ip or "<em>" .. translate("unknown") .. "</em>"%></td>
                                                <td class="cbi-section-table-cell"><%=showmac(c.mac)%></td>
                                                <td class="cbi-section-table-cell"><%=
                                                        (c.limit >= os.time()) and wat.date_format(c.limit-os.time()) or
-                                                               (c.policy ~= "normal") and "-" or "<em>" .. translate("ff_splash_expired", "expired") .. "</em>"
+                                                               (c.policy ~= "normal") and "-" or "<em>" .. translate("expired") .. "</em>"
                                                %></td>
                                                <td class="cbi-section-table-cell"><%=wat.byte_format(c.bytes_in)%> / <%=wat.byte_format(c.bytes_out)%></td>
                                                <td class="cbi-section-table-cell">