From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 3978C1FF164 for ; Fri, 8 Nov 2024 13:53:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1BE08D83D; Fri, 8 Nov 2024 13:53:03 +0100 (CET) From: Timothy Nicholson To: pve-devel@lists.proxmox.com Date: Fri, 8 Nov 2024 13:52:54 +0100 Message-Id: <20241108125254.147646-1-t.nicholson@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pve-devel] [PATCH widget-toolkit] fix #5836: ui: translate systemd states in ServiceView X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" With this patch, all systemd states and unit states in the service view use gettext to be translated. Signed-off-by: Timothy Nicholson --- As stated in the Bugzilla entry [0]: Up until now, only two systemd states were translated. This patch changes this so all systemd states use gettext and are translated. For some of the states, translations need to be added. [0]: https://bugzilla.proxmox.com/show_bug.cgi?id=5836 src/Utils.js | 11 +++++++++++ src/node/ServiceView.js | 14 ++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/Utils.js b/src/Utils.js index 7dd034a..23b0db5 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -305,6 +305,17 @@ utilities: { return Ext.htmlEncode(username); }, + renderSystemdStatus: function(status) { + switch (status) { + case 'masked': + return gettext('disabled'); + case 'not-found': + return gettext('not installed'); + default: + return gettext(status); + } + }, + 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..eb7fb01 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.renderSystemdStatus(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 gettext(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