From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH widget-toolkit v2] notify ui: fix `gettext` calls
Date: Thu, 31 Aug 2023 16:21:54 +0200 [thread overview]
Message-ID: <652ecf93-780f-488e-9005-a631c00ef190@proxmox.com> (raw)
In-Reply-To: <20230828130731.509265-1-l.wagner@proxmox.com>
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 <m.sandoval@proxmox.com>
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
>
> 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
prev parent reply other threads:[~2023-08-31 14:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-28 13:07 Lukas Wagner
2023-08-31 14:21 ` Lukas Wagner [this message]
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=652ecf93-780f-488e-9005-a631c00ef190@proxmox.com \
--to=l.wagner@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox