From b6ec181c80f3a8c6c693b29fc60c48d304fb3033 Mon Sep 17 00:00:00 2001 From: "aiyion.prime" Date: Mon, 12 Apr 2021 11:07:42 +0200 Subject: [PATCH 1/2] gluon-status-page: add role to status-page --- .../files/lib/gluon/status-page/view/status-page.html | 3 +++ package/gluon-status-page/i18n/de.po | 3 +++ package/gluon-status-page/i18n/gluon-status-page.pot | 3 +++ package/gluon-status-page/i18n/ru.README | 1 + 4 files changed, 10 insertions(+) diff --git a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html index 09bb6c3e..a50af93e 100644 --- a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html +++ b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html @@ -126,6 +126,9 @@ <%- end %> <%- end %> + <% if nodeinfo.system.role then -%> +
<%:Role%>
<%| nodeinfo.system.role %>
+ <%- end %> <% if nodeinfo.software.autoupdater then -%>
<%:Automatic updates%>
<%| enabled(nodeinfo.software.autoupdater.enabled) %><%| nodeinfo.software.autoupdater.enabled and diff --git a/package/gluon-status-page/i18n/de.po b/package/gluon-status-page/i18n/de.po index d979bc37..9b3a705c 100644 --- a/package/gluon-status-page/i18n/de.po +++ b/package/gluon-status-page/i18n/de.po @@ -97,6 +97,9 @@ msgstr "RAM" msgid "Received" msgstr "Empfangen" +msgid "Role" +msgstr "Rolle" + msgid "Site" msgstr "Site" diff --git a/package/gluon-status-page/i18n/gluon-status-page.pot b/package/gluon-status-page/i18n/gluon-status-page.pot index 2aa4b4c4..f2764e38 100644 --- a/package/gluon-status-page/i18n/gluon-status-page.pot +++ b/package/gluon-status-page/i18n/gluon-status-page.pot @@ -88,6 +88,9 @@ msgstr "" msgid "Received" msgstr "" +msgid "Role" +msgstr "" + msgid "Site" msgstr "" diff --git a/package/gluon-status-page/i18n/ru.README b/package/gluon-status-page/i18n/ru.README index 3f5101af..edd1e1ee 100644 --- a/package/gluon-status-page/i18n/ru.README +++ b/package/gluon-status-page/i18n/ru.README @@ -18,6 +18,7 @@ if we ever add Russion to gluon-web, the following strings can be reused: "Clients": "Клиенты", "Transmitted": "Передано", "Received": "Получено", +"Role": "Роль", "Forwarded": "Переправленно", "Day": "День", "Days": "Дней", From e6bdbe811a1b44a356ba0b15272bd943a8bf8e57 Mon Sep 17 00:00:00 2001 From: "aiyion.prime" Date: Fri, 23 Apr 2021 15:57:37 +0200 Subject: [PATCH 2/2] gluon-status-page: use sitetranslation for role --- .../files/lib/gluon/status-page/view/status-page.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html index a50af93e..dbafece5 100644 --- a/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html +++ b/package/gluon-status-page/files/lib/gluon/status-page/view/status-page.html @@ -4,6 +4,7 @@ local util = require 'gluon.util' local translations = {} + local site_i18n = i18n 'gluon-site' local function _(v) translations[v] = translate(v) @@ -127,7 +128,7 @@
<%- end %> <% if nodeinfo.system.role then -%> -
<%:Role%>
<%| nodeinfo.system.role %>
+
<%:Role%>
<%| site_i18n._translate('gluon-web-node-role:role:' .. nodeinfo.system.role) %>
<%- end %> <% if nodeinfo.software.autoupdater then -%>
<%:Automatic updates%>
<%| enabled(nodeinfo.software.autoupdater.enabled) %><%|