[pve-devel] [PATCH manager 1/4] ui: homogenize uses of Zstd and SCSI

[pve-devel] [PATCH manager 1/4] ui: homogenize uses of Zstd and SCSI

[Maximiliano Sandoval]

See [1, 2] for their spelling.

[1] https://en.wikipedia.org/wiki/Zstd
[2] https://en.wikipedia.org/wiki/SCSI

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 www/manager6/form/BackupCompressionSelector.js | 2 +-
 www/manager6/panel/BackupAdvancedOptions.js    | 2 +-
 www/manager6/window/DownloadUrlToStorage.js    | 2 +-
 www/manager6/window/GuestImport.js             | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/manager6/form/BackupCompressionSelector.js b/www/manager6/form/BackupCompressionSelector.js
index 014b8f7e..2efc2919 100644
--- a/www/manager6/form/BackupCompressionSelector.js
+++ b/www/manager6/form/BackupCompressionSelector.js
@@ -5,6 +5,6 @@ Ext.define('PVE.form.BackupCompressionSelector', {
                 ['0', Proxmox.Utils.noneText],
                 ['lzo', 'LZO (' + gettext('fast') + ')'],
                 ['gzip', 'GZIP (' + gettext('good') + ')'],
-                ['zstd', 'ZSTD (' + gettext('fast and good') + ')'],
+                ['zstd', 'Zstd (' + gettext('fast and good') + ')'],
     ],
 });
diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
index c79c31cb..a9c8a05a 100644
--- a/www/manager6/panel/BackupAdvancedOptions.js
+++ b/www/manager6/panel/BackupAdvancedOptions.js
@@ -136,7 +136,7 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
 	    endFlex: 2,
 	    endColumn: {
 		xtype: 'displayfield',
-		value: `${gettext('Threads used for zstd compression (non-PBS).')} ${Ext.String.format(gettext("Schema default: {0}"), 1)}`,
+		value: `${gettext('Threads used for Zstd compression (non-PBS).')} ${Ext.String.format(gettext("Schema default: {0}"), 1)}`,
 	    },
 	},
 	{
diff --git a/www/manager6/window/DownloadUrlToStorage.js b/www/manager6/window/DownloadUrlToStorage.js
index 5523a152..f165e3a9 100644
--- a/www/manager6/window/DownloadUrlToStorage.js
+++ b/www/manager6/window/DownloadUrlToStorage.js
@@ -227,7 +227,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', {
 				['__default__', Proxmox.Utils.NoneText],
 				['lzo', 'LZO'],
 				['gz', 'GZIP'],
-				['zst', 'ZSTD'],
+				['zst', 'Zstd'],
 		    ],
 		    cbind: {
 			hidden: get => get('content') !== 'iso',
diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js
index 944d275b..69e7c9bb 100644
--- a/www/manager6/window/GuestImport.js
+++ b/www/manager6/window/GuestImport.js
@@ -924,6 +924,7 @@ Ext.define('PVE.window.GuestImport', {
 		'cdrom-image-ignored': gettext("CD-ROM images cannot get imported, if required you can reconfigure the '{0}' drive in the 'Advanced' tab."),
 		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attaced as SCSI"),
 		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, scsi hardware was set to '{1}'"),
+		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, SCSI hardware was set to '{1}'"),
 		'serial-port-socket-only': gettext("Serial socket '{0}' will be mapped to a socket"),
 		'guest-is-running': gettext('Virtual guest seems to be running on source host. Import might fail or have inconsistent state!'),
 		'efi-state-lost': Ext.String.format(
-- 
2.39.2



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

[pve-devel] [PATCH manager 2/4] ui: guest import: fix typo on 'attached'

[Maximiliano Sandoval]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 www/manager6/window/GuestImport.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js
index 69e7c9bb..636fd721 100644
--- a/www/manager6/window/GuestImport.js
+++ b/www/manager6/window/GuestImport.js
@@ -922,8 +922,7 @@ Ext.define('PVE.window.GuestImport', {
 	let renderWarning = w => {
 	    const warningsCatalogue = {
 		'cdrom-image-ignored': gettext("CD-ROM images cannot get imported, if required you can reconfigure the '{0}' drive in the 'Advanced' tab."),
-		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attaced as SCSI"),
-		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, scsi hardware was set to '{1}'"),
+		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attached as SCSI"),
 		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, SCSI hardware was set to '{1}'"),
 		'serial-port-socket-only': gettext("Serial socket '{0}' will be mapped to a socket"),
 		'guest-is-running': gettext('Virtual guest seems to be running on source host. Import might fail or have inconsistent state!'),
-- 
2.39.2



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

[pve-devel] [PATCH manager 3/4] ui: backup job: inline translatable string

[Maximiliano Sandoval]

This provides translators context of what kind of noun goes before
'Threads'. The word Zstd is already in other translations.

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 www/manager6/panel/BackupAdvancedOptions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
index a9c8a05a..b9e5304e 100644
--- a/www/manager6/panel/BackupAdvancedOptions.js
+++ b/www/manager6/panel/BackupAdvancedOptions.js
@@ -121,7 +121,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,
-- 
2.39.2



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

[pve-devel] [PATCH manager 4/4] ui: backup job: simplify translatable string

[Maximiliano Sandoval]

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 www/manager6/panel/BackupAdvancedOptions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
index b9e5304e..4b31f403 100644
--- a/www/manager6/panel/BackupAdvancedOptions.js
+++ b/www/manager6/panel/BackupAdvancedOptions.js
@@ -231,7 +231,7 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
 	    xtype: 'component',
 	    padding: '5 1',
 	    html: `<span class="pmx-hint">${gettext('Note')}</span>: ${
-	        gettext("The node-specific 'vzdump.conf' or, if this is not set, the default from the config schema is used to determine fallback values.")}`,
+	        gettext("The node-specific 'vzdump.conf'. If not set, the defaults from the config schema are used to determine fallback values.")}`,
 	},
     ],
 });
-- 
2.39.2



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

Re: [pve-devel] [PATCH manager 1/4] ui: homogenize uses of Zstd and SCSI

[Fiona Ebner]

Am 23.04.24 um 10:27 schrieb Maximiliano Sandoval:
> diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js
> index 944d275b..69e7c9bb 100644
> --- a/www/manager6/window/GuestImport.js
> +++ b/www/manager6/window/GuestImport.js
> @@ -924,6 +924,7 @@ Ext.define('PVE.window.GuestImport', {
>  		'cdrom-image-ignored': gettext("CD-ROM images cannot get imported, if required you can reconfigure the '{0}' drive in the 'Advanced' tab."),
>  		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attaced as SCSI"),
>  		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, scsi hardware was set to '{1}'"),
> +		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, SCSI hardware was set to '{1}'"),

This adds a duplicate (which is fixed by the next patch).

>  		'serial-port-socket-only': gettext("Serial socket '{0}' will be mapped to a socket"),
>  		'guest-is-running': gettext('Virtual guest seems to be running on source host. Import might fail or have inconsistent state!'),
>  		'efi-state-lost': Ext.String.format(


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

Re: [pve-devel] [PATCH manager 4/4] ui: backup job: simplify translatable string

[Fiona Ebner]

Am 23.04.24 um 10:27 schrieb Maximiliano Sandoval:
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
>  www/manager6/panel/BackupAdvancedOptions.js | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
> index b9e5304e..4b31f403 100644
> --- a/www/manager6/panel/BackupAdvancedOptions.js
> +++ b/www/manager6/panel/BackupAdvancedOptions.js
> @@ -231,7 +231,7 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
>  	    xtype: 'component',
>  	    padding: '5 1',
>  	    html: `<span class="pmx-hint">${gettext('Note')}</span>: ${
> -	        gettext("The node-specific 'vzdump.conf' or, if this is not set, the default from the config schema is used to determine fallback values.")}`,
> +	        gettext("The node-specific 'vzdump.conf'. If not set, the defaults from the config schema are used to determine fallback values.")}`,
>  	},
>      ],
>  });

"The node-specific 'vzdump.conf'." is not a proper sentence.


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

Re: [pve-devel] [PATCH manager 1/4] ui: homogenize uses of Zstd and SCSI

[Fabian Grünbichler]

On April 23, 2024 10:27 am, Maximiliano Sandoval wrote:
> See [1, 2] for their spelling.
> 
> [1] https://en.wikipedia.org/wiki/Zstd

neither the upstream repo, nor the corresponding RFC indicate that this
is the desired spelling (it is "Zstandard", but the short variant is
called "zstd" in both places, except for a single "Zstd" in the Readme
of the repo, which might as well be a typo ;)). you have to ignore all
the occurences at the start of a sentence of course..

> [2] https://en.wikipedia.org/wiki/SCSI
> 
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
>  www/manager6/form/BackupCompressionSelector.js | 2 +-
>  www/manager6/panel/BackupAdvancedOptions.js    | 2 +-
>  www/manager6/window/DownloadUrlToStorage.js    | 2 +-
>  www/manager6/window/GuestImport.js             | 1 +
>  4 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/www/manager6/form/BackupCompressionSelector.js b/www/manager6/form/BackupCompressionSelector.js
> index 014b8f7e..2efc2919 100644
> --- a/www/manager6/form/BackupCompressionSelector.js
> +++ b/www/manager6/form/BackupCompressionSelector.js
> @@ -5,6 +5,6 @@ Ext.define('PVE.form.BackupCompressionSelector', {
>                  ['0', Proxmox.Utils.noneText],
>                  ['lzo', 'LZO (' + gettext('fast') + ')'],
>                  ['gzip', 'GZIP (' + gettext('good') + ')'],

funnily enough, GZIP would be the more likely candidate for such a
change, after all it is normally just spelled `gzip`..

> -                ['zstd', 'ZSTD (' + gettext('fast and good') + ')'],
> +                ['zstd', 'Zstd (' + gettext('fast and good') + ')'],
>      ],
>  });
> diff --git a/www/manager6/panel/BackupAdvancedOptions.js b/www/manager6/panel/BackupAdvancedOptions.js
> index c79c31cb..a9c8a05a 100644
> --- a/www/manager6/panel/BackupAdvancedOptions.js
> +++ b/www/manager6/panel/BackupAdvancedOptions.js
> @@ -136,7 +136,7 @@ Ext.define('PVE.panel.BackupAdvancedOptions', {
>  	    endFlex: 2,
>  	    endColumn: {
>  		xtype: 'displayfield',
> -		value: `${gettext('Threads used for zstd compression (non-PBS).')} ${Ext.String.format(gettext("Schema default: {0}"), 1)}`,
> +		value: `${gettext('Threads used for Zstd compression (non-PBS).')} ${Ext.String.format(gettext("Schema default: {0}"), 1)}`,
>  	    },
>  	},
>  	{
> diff --git a/www/manager6/window/DownloadUrlToStorage.js b/www/manager6/window/DownloadUrlToStorage.js
> index 5523a152..f165e3a9 100644
> --- a/www/manager6/window/DownloadUrlToStorage.js
> +++ b/www/manager6/window/DownloadUrlToStorage.js
> @@ -227,7 +227,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', {
>  				['__default__', Proxmox.Utils.NoneText],
>  				['lzo', 'LZO'],
>  				['gz', 'GZIP'],
> -				['zst', 'ZSTD'],
> +				['zst', 'Zstd'],
>  		    ],
>  		    cbind: {
>  			hidden: get => get('content') !== 'iso',
> diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js
> index 944d275b..69e7c9bb 100644
> --- a/www/manager6/window/GuestImport.js
> +++ b/www/manager6/window/GuestImport.js
> @@ -924,6 +924,7 @@ Ext.define('PVE.window.GuestImport', {
>  		'cdrom-image-ignored': gettext("CD-ROM images cannot get imported, if required you can reconfigure the '{0}' drive in the 'Advanced' tab."),
>  		'nvme-unsupported': gettext("NVMe disks are currently not supported, '{0}' will get attaced as SCSI"),
>  		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, scsi hardware was set to '{1}'"),
> +		'ovmf-with-lsi-unsupported': gettext("OVMF is built without LSI drivers, SCSI hardware was set to '{1}'"),

if the two corrections were separate patches, I could have already
applied this one, alas..

>  		'serial-port-socket-only': gettext("Serial socket '{0}' will be mapped to a socket"),
>  		'guest-is-running': gettext('Virtual guest seems to be running on source host. Import might fail or have inconsistent state!'),
>  		'efi-state-lost': Ext.String.format(
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 


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