From: Timothy Nicholson <t.nicholson@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH widget-toolkit v2] fix #5836: ui: translate systemd states in ServiceView
Date: Mon, 11 Nov 2024 11:37:05 +0100 [thread overview]
Message-ID: <20241111103705.76679-1-t.nicholson@proxmox.com> (raw)
Signed-off-by: Timothy Nicholson <t.nicholson@proxmox.com>
---
changes since v1 [0]:
- pass literal strings to gettext
- changed switch-case to include common systemd states
[0]: https://lore.proxmox.com/pve-devel/20241108125254.147646-1-t.nicholson@proxmox.com/
src/Utils.js | 25 +++++++++++++++++++++++++
src/node/ServiceView.js | 14 ++++++--------
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/Utils.js b/src/Utils.js
index 7dd034a..c189f98 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -305,6 +305,31 @@ utilities: {
return Ext.htmlEncode(username);
},
+ renderSystemdState: function(state) {
+ switch (state) {
+ case 'enabled':
+ return gettext('enabled');
+ case 'disabled':
+ return gettext('disabled');
+ case 'running':
+ return gettext('running');
+ case 'dead':
+ return gettext('dead');
+ case 'not-found':
+ return gettext('not installed');
+ case 'static':
+ return gettext('static');
+ case 'reload':
+ return gettext('reload');
+ case 'start':
+ return gettext('start');
+ case 'stop':
+ return gettext('stop');
+ default:
+ return state;
+ }
+ },
+
getStoredAuth: function() {
let storedAuth = JSON.parse(window.localStorage.getItem('ProxmoxUser'));
return storedAuth || {};
diff --git a/src/node/ServiceView.js b/src/node/ServiceView.js
index 19cfc18..c519da1 100644
--- a/src/node/ServiceView.js
+++ b/src/node/ServiceView.js
@@ -180,14 +180,8 @@ Ext.define('Proxmox.node.ServiceView', {
sortable: true,
dataIndex: 'state',
renderer: (value, meta, rec) => {
- const unitState = rec.get('unit-state');
- if (unitState === 'masked') {
- return gettext('disabled');
- } else if (unitState === 'not-found') {
- return gettext('not installed');
- } else {
- return value;
- }
+ const state = rec.get('state');
+ return Proxmox.Utils.renderSystemdState(state);
},
},
{
@@ -203,6 +197,10 @@ Ext.define('Proxmox.node.ServiceView', {
sortable: true,
hidden: !Ext.Array.contains(['PVEAuthCookie', 'PBSAuthCookie'], Proxmox?.Setup?.auth_cookie_name),
dataIndex: 'unit-state',
+ renderer: (value, meta, rec) => {
+ const unitState = rec.get('unit-state');
+ return Proxmox.Utils.renderSystemdState(unitState);
+ }
},
{
header: gettext('Description'),
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next reply other threads:[~2024-11-11 10:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 10:37 Timothy Nicholson [this message]
2024-11-11 12:01 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241111103705.76679-1-t.nicholson@proxmox.com \
--to=t.nicholson@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.