applied both patches On Thu, Jan 25, 2018 at 03:55:10PM +0100, Dominik Csapak wrote: > we always expected MiB/GiB but labeled them incorrectly > > Signed-off-by: Dominik Csapak <[email protected]> > --- > www/manager6/form/DiskStorageSelector.js | 2 +- > www/manager6/lxc/MPResize.js | 2 +- > www/manager6/lxc/ResourceEdit.js | 4 ++-- > www/manager6/qemu/HDResize.js | 2 +- > www/manager6/qemu/MemoryEdit.js | 6 +++--- > 5 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/www/manager6/form/DiskStorageSelector.js > b/www/manager6/form/DiskStorageSelector.js > index 2067a6ca..0fdb5c5c 100644 > --- a/www/manager6/form/DiskStorageSelector.js > +++ b/www/manager6/form/DiskStorageSelector.js > @@ -113,7 +113,7 @@ Ext.define('PVE.form.DiskStorageSelector', { > itemId: 'disksize', > reference: 'disksize', > name: 'disksize', > - fieldLabel: gettext('Disk size') + ' (GB)', > + fieldLabel: gettext('Disk size') + ' (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 74139237..430a1e32 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') + ' (GB)', > + fieldLabel: gettext('Size Increment') + ' (GiB)', > allowBlank: false > }); > > diff --git a/www/manager6/lxc/ResourceEdit.js > b/www/manager6/lxc/ResourceEdit.js > index 5feabcea..395c31e8 100644 > --- a/www/manager6/lxc/ResourceEdit.js > +++ b/www/manager6/lxc/ResourceEdit.js > @@ -126,7 +126,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', { > maxValue: 512*1024, > value: '512', > step: 32, > - fieldLabel: gettext('Memory') + ' (MB)', > + fieldLabel: gettext('Memory') + ' (MiB)', > labelWidth: labelWidth, > allowBlank: false > }, > @@ -137,7 +137,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', { > maxValue: 128*1024, > value: '512', > step: 32, > - fieldLabel: gettext('Swap') + ' (MB)', > + fieldLabel: gettext('Swap') + ' (MiB)', > labelWidth: labelWidth, > allowBlank: false > } > diff --git a/www/manager6/qemu/HDResize.js b/www/manager6/qemu/HDResize.js > index 5fb3bc95..5ca564d2 100644 > --- a/www/manager6/qemu/HDResize.js > +++ b/www/manager6/qemu/HDResize.js > @@ -49,7 +49,7 @@ Ext.define('PVE.window.HDResize', { > maxValue: 128*1024, > decimalPrecision: 3, > value: '0', > - fieldLabel: gettext('Size Increment') + ' (GB)', > + fieldLabel: gettext('Size Increment') + ' (GiB)', > allowBlank: false > }); > > diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js > index c6aaf0db..1974abc4 100644 > --- a/www/manager6/qemu/MemoryEdit.js > +++ b/www/manager6/qemu/MemoryEdit.js > @@ -62,7 +62,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { > xtype: 'pveMemoryField', > name: 'memory', > hotplug: me.hotplug, > - fieldLabel: gettext('Memory') + ' (MB)', > + fieldLabel: gettext('Memory') + ' (MiB)', > labelAlign: 'right', > labelWidth: labelWidth > }, > @@ -94,7 +94,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { > hotplug: me.hotplug, > disabled: true, > value: '1024', > - fieldLabel: gettext('Maximum memory') + ' (MB)', > + fieldLabel: gettext('Maximum memory') + ' (MiB)', > labelAlign: 'right', > labelWidth: labelWidth, > listeners: { > @@ -116,7 +116,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { > maxValue: 512*1024, > value: '512', > step: 32, > - fieldLabel: gettext('Minimum memory') + ' (MB)', > + fieldLabel: gettext('Minimum memory') + ' (MiB)', > labelAlign: 'right', > labelWidth: labelWidth, > allowBlank: false > -- > 2.11.0
_______________________________________________ pve-devel mailing list [email protected] https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
