=== DiagnosticsApplet.lua ================================================================== --- DiagnosticsApplet.lua (revision 39045) +++ DiagnosticsApplet.lua (local) @@ -91,11 +91,21 @@ ["24"] = "BATT_CHARGING_PAUSED", } -function setValue(self, key, value) - if not value then - value = '-' +function setValue(self, key, value, ...) + local customLabelArgs = { ... } + + -- if we have customLabelArgs, we want to insert those first to the string args + if #customLabelArgs >= 1 then + if not value then + value = '-' + end + self.diagMenu:setText(self.labels[key], self:string(key, ..., value)) + else + if not value then + value = '-' + end + self.diagMenu:setText(self.labels[key], self:string(key, value)) end - self.diagMenu:setText(self.labels[key], self:string(key, value)) end @@ -107,7 +117,7 @@ end -function serverPort(self, server, port, key) +function serverPort(self, server, port, key, ...) if not server then self:setValue(key, self.notConnected) return @@ -126,7 +136,7 @@ end if ip == nil then - self:setValue(key, portFail) + self:setValue(key, portFail, ...) return end @@ -137,9 +147,9 @@ local res, err = tcp.t_sock:send(" ") if err then - self:setValue(key, portFail) + self:setValue(key, portFail, ...) else - self:setValue(key, portOk) + self:setValue(key, portOk, ...) end tcp:close() @@ -393,7 +403,8 @@ self:setValue("SC_NAME", sc:getName()) self:serverPing(sc, "SC_ADDRESS", "SC_PING") self:serverPort(sc, 3483, "SC_PORT_3483") - self:serverPort(sc, 9000, "SC_PORT_9000") + local ip, port = sc:getIpPort() + self:serverPort(sc, port, "SC_WEB_PORT", port) end === strings.txt ================================================================== --- strings.txt (revision 39045) +++ strings.txt (local) @@ -528,6 +528,9 @@ RU TCP-порт 3483\n%s SV TCP-port 3483\n%s +SC_WEB_PORT + EN TCP port %s\n%s + SC_PORT_9000 CS TCP port 9000\n%s DA TCP-port 9000\n%s