* [pve-devel] [PATCH pve-manager v4] fix #4551: ui: use gettext on hardcoded byte units
@ 2023-07-03 12:15 Noel Ullreich
2023-07-05 7:14 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Noel Ullreich @ 2023-07-03 12:15 UTC (permalink / raw)
To: pve-devel
Since some languages translate byte units like 'GiB' or write them in their
own script, this patch wraps units in the `gettext` function.
While most occurrences of byte strings can be translated within the
`format_size` function in `proxmox-widget-toolkit/src/Utils.js`, this patch
catches those instances that are not translated.
Signed-off-by: Noel Ullreich <n.ullreich@proxmox.com>
---
changes from v1:
* improved commit messages
* put hardcoded byte unit strings in a template string
changes from v2:
* rebased the patch
changges from v3:
* rebased the patch
www/manager6/ceph/OSD.js | 4 ++--
www/manager6/form/DiskStorageSelector.js | 2 +-
www/manager6/lxc/MPResize.js | 2 +-
www/manager6/qemu/HDResize.js | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js
index 69d5061fc..d2caafa4a 100644
--- a/www/manager6/ceph/OSD.js
+++ b/www/manager6/ceph/OSD.js
@@ -83,7 +83,7 @@ Ext.define('PVE.CephCreateOsd', {
{
xtype: 'numberfield',
name: 'db_dev_size',
- fieldLabel: gettext('DB size') + ' (GiB)',
+ fieldLabel: `${gettext('DB size')} (${gettext('GiB')})`,
minValue: 1,
maxValue: 128*1024,
decimalPrecision: 2,
@@ -137,7 +137,7 @@ Ext.define('PVE.CephCreateOsd', {
{
xtype: 'numberfield',
name: 'wal_dev_size',
- fieldLabel: gettext('WAL size') + ' (GiB)',
+ fieldLabel: `${gettext('WAL size')} (${gettext('GiB')})`,
minValue: 0.5,
maxValue: 128*1024,
decimalPrecision: 2,
diff --git a/www/manager6/form/DiskStorageSelector.js b/www/manager6/form/DiskStorageSelector.js
index 860a3b3ca..0ef48f512 100644
--- a/www/manager6/form/DiskStorageSelector.js
+++ b/www/manager6/form/DiskStorageSelector.js
@@ -145,7 +145,7 @@ Ext.define('PVE.form.DiskStorageSelector', {
xtype: 'numberfield',
itemId: 'disksize',
name: 'disksize',
- fieldLabel: gettext('Disk size') + ' (GiB)',
+ fieldLabel: `${gettext('Disk size')} (${gettext('GiB')})`,
hidden: me.hideSize,
disabled: me.hideSize,
minValue: 0.001,
diff --git a/www/manager6/lxc/MPResize.js b/www/manager6/lxc/MPResize.js
index 881c037b0..d560b7886 100644
--- a/www/manager6/lxc/MPResize.js
+++ b/www/manager6/lxc/MPResize.js
@@ -52,7 +52,7 @@ Ext.define('PVE.window.MPResize', {
maxValue: 128*1024,
decimalPrecision: 3,
value: '0',
- fieldLabel: gettext('Size Increment') + ' (GiB)',
+ fieldLabel: `${gettext('Size Increment')} (${gettext('GiB')})`,
allowBlank: false,
});
diff --git a/www/manager6/qemu/HDResize.js b/www/manager6/qemu/HDResize.js
index 97bec73b1..e2a3ce491 100644
--- a/www/manager6/qemu/HDResize.js
+++ b/www/manager6/qemu/HDResize.js
@@ -53,7 +53,7 @@ Ext.define('PVE.window.HDResize', {
maxValue: 128*1024,
decimalPrecision: 3,
value: '0',
- fieldLabel: gettext('Size Increment') + ' (GiB)',
+ fieldLabel: `${gettext('Size Increment')} (${gettext('GiB')})`,
allowBlank: false,
});
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH pve-manager v4] fix #4551: ui: use gettext on hardcoded byte units
2023-07-03 12:15 [pve-devel] [PATCH pve-manager v4] fix #4551: ui: use gettext on hardcoded byte units Noel Ullreich
@ 2023-07-05 7:14 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2023-07-05 7:14 UTC (permalink / raw)
To: Proxmox VE development discussion, Noel Ullreich
Am 03/07/2023 um 14:15 schrieb Noel Ullreich:
> Since some languages translate byte units like 'GiB' or write them in their
> own script, this patch wraps units in the `gettext` function.
>
> While most occurrences of byte strings can be translated within the
> `format_size` function in `proxmox-widget-toolkit/src/Utils.js`, this patch
> catches those instances that are not translated.
>
> Signed-off-by: Noel Ullreich <n.ullreich@proxmox.com>
> ---
> changes from v1:
> * improved commit messages
> * put hardcoded byte unit strings in a template string
>
> changes from v2:
> * rebased the patch
>
> changges from v3:
> * rebased the patch
>
> www/manager6/ceph/OSD.js | 4 ++--
> www/manager6/form/DiskStorageSelector.js | 2 +-
> www/manager6/lxc/MPResize.js | 2 +-
> www/manager6/qemu/HDResize.js | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-05 7:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-03 12:15 [pve-devel] [PATCH pve-manager v4] fix #4551: ui: use gettext on hardcoded byte units Noel Ullreich
2023-07-05 7:14 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox