[pve-devel] [PATCH widget-toolkit] fix #6088: notification: matcher: use more descriptive strings

[pve-devel] [PATCH widget-toolkit] fix #6088: notification: matcher: use more descriptive strings

[Maximiliano Sandoval]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---

The longest translation of "At least one rule does not match" has only 4 more
characters than the original, this is not a problem for the size we have
available as in most cases the rules carry even longer text.

 src/window/NotificationMatcherEdit.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/window/NotificationMatcherEdit.js b/src/window/NotificationMatcherEdit.js
index 9ab443f..83c09ea 100644
--- a/src/window/NotificationMatcherEdit.js
+++ b/src/window/NotificationMatcherEdit.js
@@ -491,12 +491,17 @@ Ext.define('Proxmox.panel.NotificationMatchRuleTree', {
 	    } break;
 	    case 'mode':
 		if (data.value === 'all') {
-		    text = gettext("All");
+		    if (data.invert) {
+			text = gettext('At least one rule does not match');
+		    } else {
+			text = gettext('All rules match');
+		    }
 		} else if (data.value === 'any') {
-		    text = gettext("Any");
-		}
-		if (data.invert) {
-		    text = `!${text}`;
+		    if (data.invert) {
+			text = gettext('No rule matches');
+		    } else {
+			text = gettext('Any rule matches');
+		    }
 		}
 		iconCls = 'fa fa-filter';
 
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH widget-toolkit] fix #6088: notification: matcher: use more descriptive strings

[Lukas Wagner]

On  2025-01-28 10:31, Maximiliano Sandoval wrote:
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
> 
> The longest translation of "At least one rule does not match" has only 4 more
> characters than the original, this is not a problem for the size we have
> available as in most cases the rules carry even longer text.
> 

Tested this quickly on PBS. As discussed off-list this change makes sense to me and should
help avoid any confusion due to misleading translations as in the referenced BZ entry.

Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Lukas Wagner <l.wagner@proxmox.com>

-- 
- Lukas



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH widget-toolkit] fix #6088: notification: matcher: use more descriptive strings

[Thomas Lamprecht]

Am 28.01.25 um 10:31 schrieb Maximiliano Sandoval:
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
> 
> The longest translation of "At least one rule does not match" has only 4 more
> characters than the original, this is not a problem for the size we have
> available as in most cases the rules carry even longer text.
> 
>  src/window/NotificationMatcherEdit.js | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
>

applied, with Lukas' T-b and R-b, thanks!


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel