From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0C18F9D3C for ; Mon, 28 Aug 2023 15:08:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D86A81D839 for ; Mon, 28 Aug 2023 15:07:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 28 Aug 2023 15:07:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 18081471FA for ; Mon, 28 Aug 2023 15:07:37 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 28 Aug 2023 15:07:31 +0200 Message-Id: <20230828130731.509265-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.037 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH widget-toolkit v2] notify ui: fix `gettext` calls 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: , X-List-Received-Date: Mon, 28 Aug 2023 13:08:08 -0000 gettext is rather dumb and does not like multi-line strings or string interpolation. Reported-by: Maximiliano Sandoval Signed-off-by: Lukas Wagner --- Changelog v1 -> v2: - now with 100% more `gettext` (TM)! src/panel/NotificationConfigView.js | 4 ++-- src/panel/SendmailEditPanel.js | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/panel/NotificationConfigView.js b/src/panel/NotificationConfigView.js index 6586524..7935dca 100644 --- a/src/panel/NotificationConfigView.js +++ b/src/panel/NotificationConfigView.js @@ -88,7 +88,7 @@ Ext.define('Proxmox.panel.NotificationEndpointView', { Ext.Msg.confirm( gettext("Notification Target Test"), - gettext(`Do you want to send a test notification to '${target}'?`), + Ext.String.format(gettext("Do you want to send a test notification to '{0}'?"), target), function(decision) { if (decision !== "yes") { return; @@ -101,7 +101,7 @@ Ext.define('Proxmox.panel.NotificationEndpointView', { success: function(response, opt) { Ext.Msg.show({ title: gettext('Notification Target Test'), - message: gettext(`Sent test notification to '${target}'.`), + message: Ext.String.format(gettext("Sent test notification to '{0}'."), target), buttons: Ext.Msg.OK, icon: Ext.Msg.INFO, }); diff --git a/src/panel/SendmailEditPanel.js b/src/panel/SendmailEditPanel.js index b814f39..ace6129 100644 --- a/src/panel/SendmailEditPanel.js +++ b/src/panel/SendmailEditPanel.js @@ -80,9 +80,7 @@ Ext.define('Proxmox.panel.SendmailEditPanel', { }, autoEl: { tag: 'div', - 'data-qtip': gettext( - 'Multiple recipients must be separated by spaces, commas or semicolons', - ), + 'data-qtip': gettext('Multiple recipients must be separated by spaces, commas or semicolons'), }, validator: function() { return this.up('pmxSendmailEditPanel').mailValidator(); -- 2.39.2