[pbs-devel] [PATCH proxmox-backup] node config: display default language

[pbs-devel] [PATCH proxmox-backup] node config: display default language

[Matthias Heiserer]

The default-langage can now be reset by selecting 'Default (English)'.

Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
 www/config/NodeOptionView.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/www/config/NodeOptionView.js b/www/config/NodeOptionView.js
index 24458058..506768d9 100644
--- a/www/config/NodeOptionView.js
+++ b/www/config/NodeOptionView.js
@@ -46,11 +46,10 @@ Ext.define('PBS.NodeOptionView', {
 	    xtype: 'combobox',
 	    name: 'default-lang',
 	    text: gettext('Default language'),
-	    defaultValue: 'English',
-	    // skip the 'default' item. It's not possible to delete the default
-	    // language from the GUI, but setting it to 'en' has the same result
-	    comboItems: Proxmox.Utils.language_array().slice(1),
+	    defaultValue: '__default__',
+	    comboItems: Proxmox.Utils.language_array(),
 	    deleteEmpty: true,
+	    renderer: Proxmox.Utils.render_language,
 	},
     ],
 
-- 
2.30.2

[pbs-devel] [PATCH proxmox-widget-toolkit] utils: render default value correctly

[Matthias Heiserer]

Required for corresponding proxmox-backup patch to work correctly.
Otherwise, __default__ is shown when no default-language is set.

Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
 src/Utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Utils.js b/src/Utils.js
index 15baac3..d325644 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -90,7 +90,7 @@ utilities: {
     },
 
     render_language: function(value) {
-	if (!value) {
+	if (!value || value === '__default__') {
 	    return Proxmox.Utils.defaultText + ' (English)';
 	}
 	let text = Proxmox.Utils.language_map[value];
-- 
2.30.2

Re: [pbs-devel] [PATCH proxmox-backup] node config: display default language

[Thomas Lamprecht]

On 10.02.22 11:16, Matthias Heiserer wrote:
> The default-langage can now be reset by selecting 'Default (English)'.
> 

this seems to be on top of your not yet applied patch? That should be
mentioned, but actually it would be even nicer if you coukd squash
that into the old one?

For futher series it'd be also great if you could mark revisions as such,
i.e., using git format-patchs' `-vN`, e.g., `-v2` in this case - thx!

> Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
> ---

for such small series its pretty clear, but it still can make sense to
note that this (soft-)depends on a bumped proxmox-widget-toolkit in this
"meta area" here.

>  www/config/NodeOptionView.js | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/www/config/NodeOptionView.js b/www/config/NodeOptionView.js
> index 24458058..506768d9 100644
> --- a/www/config/NodeOptionView.js
> +++ b/www/config/NodeOptionView.js
> @@ -46,11 +46,10 @@ Ext.define('PBS.NodeOptionView', {
>  	    xtype: 'combobox',
>  	    name: 'default-lang',
>  	    text: gettext('Default language'),
> -	    defaultValue: 'English',
> -	    // skip the 'default' item. It's not possible to delete the default
> -	    // language from the GUI, but setting it to 'en' has the same result
> -	    comboItems: Proxmox.Utils.language_array().slice(1),
> +	    defaultValue: '__default__',
> +	    comboItems: Proxmox.Utils.language_array(),
>  	    deleteEmpty: true,
> +	    renderer: Proxmox.Utils.render_language,
>  	},
>      ],
>  

looks OK change wise, once squashed:

Reviewed-by: Thomas Lamprecht <t.lamprecht@proxmox.com>