luci-mod: use built-in format for wifi hostname

Signed-off-by: Paul Donald <redacted>

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index 36c88b4533483ffa8bcaad503e888aab03d3a0d0..a9ab42c791f4347b5e53ffe8ef0f31ea94f9015c 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -713,9 +713,9 @@ return view.extend({
                        let hint;
 
                        if (name && ipv4 && ipv6)
-                               hint = `${name} <span class="hide-xs">(${ipv4}, ${ipv6})</span>`;
+                               hint = `${'%h'.format(name)} <span class="hide-xs">(${ipv4}, ${ipv6})</span>`;
                        else if (name && (ipv4 ?? ipv6))
-                               hint = `${name} <span class="hide-xs">(${ipv4 || ipv6})</span>`;
+                               hint = `${'%h'.format(name)} <span class="hide-xs">(${ipv4 || ipv6})</span>`;
                        else
                                hint = name || ipv4 || ipv6 || '?';
 

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
index 01f7cbe0d565b06542cffa24c63b796564001cf4..96a9eece87d908607d537dc975665ce65b133589 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
@@ -300,9 +300,9 @@ return baseclass.extend({
                                let hint;
 
                                if (name && ipv4 && ipv6)
-                                       hint = '%s <span class="hide-xs">(%s, %s)</span>'.format(name, ipv4, ipv6);
+                                       hint = '%h <span class="hide-xs">(%s, %s)</span>'.format(name, ipv4, ipv6);
                                else if (name && (ipv4 || ipv6))
-                                       hint = '%s <span class="hide-xs">(%s)</span>'.format(name, ipv4 || ipv6);
+                                       hint = '%h <span class="hide-xs">(%s)</span>'.format(name, ipv4 || ipv6);
                                else
                                        hint = name || ipv4 || ipv6 || '?';