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 B5D708930 for ; Thu, 31 Aug 2023 16:21:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 98C86B595 for ; Thu, 31 Aug 2023 16:21:55 +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 ; Thu, 31 Aug 2023 16:21:55 +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 D80D047B54 for ; Thu, 31 Aug 2023 16:21:54 +0200 (CEST) Message-ID: <652ecf93-780f-488e-9005-a631c00ef190@proxmox.com> Date: Thu, 31 Aug 2023 16:21:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: pve-devel@lists.proxmox.com References: <20230828130731.509265-1-l.wagner@proxmox.com> Content-Language: de-AT, en-US From: Lukas Wagner In-Reply-To: <20230828130731.509265-1-l.wagner@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.034 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: Re: [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: Thu, 31 Aug 2023 14:21:55 -0000 On 8/28/23 15:07, Lukas Wagner wrote: > gettext is rather dumb and does not like multi-line strings or string > interpolation. > > Reported-by: Maximiliano Sandoval > Signed-off-by: Lukas Wagner > --- > > 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(); These changes will be incorporated in v2 of the SMTP endpoint patch series, otherwise there would be conflicts when applying. -- - Lukas