From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id AA3A91FF164 for <inbox@lore.proxmox.com>; Fri, 28 Feb 2025 11:24:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 813BAA341; Fri, 28 Feb 2025 11:24:17 +0100 (CET) From: Maximiliano Sandoval <m.sandoval@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 28 Feb 2025 11:23:42 +0100 Message-Id: <20250228102342.163467-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.100 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 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. 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 manager] ui: do not split translatable strings X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Splitting the strings adds extra work to translators as they now have less context to work with. Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com> --- www/manager6/ceph/OSD.js | 6 +++--- www/manager6/dc/OptionView.js | 2 +- www/manager6/panel/BackupAdvancedOptions.js | 2 +- www/manager6/qemu/PCIEdit.js | 8 ++++---- www/manager6/window/CephInstall.js | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js index d2caafa4a..67ad133f0 100644 --- a/www/manager6/ceph/OSD.js +++ b/www/manager6/ceph/OSD.js @@ -233,7 +233,7 @@ Ext.define('PVE.CephSetFlags', { onlineHelp: 'pve_ceph_osds', isCreate: true, - title: Ext.String.format(gettext('Manage {0}'), 'Global OSD Flags'), + title: gettext('Manage Global OSD Flags'), submitText: gettext('Apply'), items: [ @@ -833,11 +833,11 @@ Ext.define('PVE.node.CephOsdTree', { }, '-', { - text: gettext('Create') + ': OSD', + text: gettext('Create: OSD'), handler: 'create_osd', }, { - text: Ext.String.format(gettext('Manage {0}'), 'Global Flags'), + text: gettext('Manage Global Flags'), handler: 'set_flags', }, '->', diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index bd54d7618..0496f6d5f 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -195,7 +195,7 @@ Ext.define('PVE.dc.OptionView', { xtype: 'box', height: 25, html: `<span class='pmx-hint'>${gettext('Note:')}</span> ` - + Ext.String.format(gettext('{0} is deprecated, use {1}'), 'U2F', 'WebAuthn'), + + gettext('U2F is deprecated, use WebAuthn'), }, { xtype: 'displayfield', diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js index a7b0fc2b3..1050cbb1d 100644 --- a/www/manager6/panel/BackupAdvancedOptions.js +++ b/www/manager6/panel/BackupAdvancedOptions.js @@ -158,7 +158,7 @@ Ext.define('PVE.panel.BackupAdvancedOptions', { xtype: 'proxmoxintegerfield', name: 'zstd', reference: 'zstdThreadCount', - fieldLabel: Ext.String.format(gettext('{0} Threads'), 'Zstd'), + fieldLabel: gettext('Zstd Threads'), fieldStyle: 'text-align: right', emptyText: gettext('Fallback'), minValue: 0, diff --git a/www/manager6/qemu/PCIEdit.js b/www/manager6/qemu/PCIEdit.js index 8f633cb6e..6ed9918c5 100644 --- a/www/manager6/qemu/PCIEdit.js +++ b/www/manager6/qemu/PCIEdit.js @@ -288,7 +288,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { { xtype: 'textfield', name: 'vendor-id', - fieldLabel: Ext.String.format(gettext('{0} ID'), gettext('Vendor')), + fieldLabel: gettext('Vendor ID'), emptyText: gettext('From Device'), vtype: 'PciId', allowBlank: true, @@ -297,7 +297,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { { xtype: 'textfield', name: 'device-id', - fieldLabel: Ext.String.format(gettext('{0} ID'), gettext('Device')), + fieldLabel: gettext('Device ID'), emptyText: gettext('From Device'), vtype: 'PciId', allowBlank: true, @@ -315,7 +315,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { { xtype: 'textfield', name: 'sub-vendor-id', - fieldLabel: Ext.String.format(gettext('{0} ID'), gettext('Sub-Vendor')), + fieldLabel: gettext('Sub-Vendor ID'), emptyText: gettext('From Device'), vtype: 'PciId', allowBlank: true, @@ -324,7 +324,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { { xtype: 'textfield', name: 'sub-device-id', - fieldLabel: Ext.String.format(gettext('{0} ID'), gettext('Sub-Device')), + fieldLabel: gettext('Sub-Device ID'), emptyText: gettext('From Device'), vtype: 'PciId', allowBlank: true, diff --git a/www/manager6/window/CephInstall.js b/www/manager6/window/CephInstall.js index 326051291..759536c39 100644 --- a/www/manager6/window/CephInstall.js +++ b/www/manager6/window/CephInstall.js @@ -35,11 +35,11 @@ Ext.define('PVE.ceph.Install', { windowText: function(get) { if (get('isInstalled')) { return `<p class="install-mask"> - ${Ext.String.format(gettext('{0} is not initialized.'), 'Ceph')} + ${gettext('Ceph is not initialized.')} ${gettext('You need to create an initial config once.')}</p>`; } else { return '<p class="install-mask">' + - Ext.String.format(gettext('{0} is not installed on this node.'), 'Ceph') + '<br>' + + gettext('Ceph is not installed on this node.') + '<br>' + gettext('Would you like to install it now?') + '</p>'; } }, -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel