fix #1393: use language from datacenter.cfg for gui

if we do not have a language cookie, try to read
the language from the datacenter.cfg and fall back to 'en'

also set it into the 'Proxmox' object, so that the gui can show it
in the LoginWindow

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index b092438a067516416562dff2ac8e36a62b5d0702..bb60b29e95cdfeae96811b2dedb4cc55f553a5c7 100755 (executable)
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -10,6 +10,7 @@ use Encode;
 use URI;
 use URI::QueryParam;
 use Data::Dumper;
+use PVE::Cluster;
 use PVE::API2Tools;
 use PVE::API2;
 use PVE::APIServer::Formatter;
@@ -176,7 +177,7 @@ sub is_phone {
 sub get_index {
     my ($nodename, $server, $r, $args) = @_;
 
-    my $lang = 'en';
+    my $lang;
     my $username;
     my $token = 'null';
 
@@ -192,6 +193,11 @@ sub get_index {
        }
     }
 
+    if (!$lang) {
+       my $dc_conf = PVE::Cluster::cfs_read_file('datacenter.cfg');
+       $lang = $dc_conf->{language} // 'en';
+    }
+
     $username = '' if !$username;
 
     my $mobile = is_phone($r->header('User-Agent')) ? 1 : 0;

diff --git a/www/index.html.tpl b/www/index.html.tpl
index a972e3aa49de95364a1ad8ced8568ec28101b5e9..ae7f610f01991bcad2e14ed91ab1a66cf75b9cb1 100644 (file)
--- a/www/index.html.tpl
+++ b/www/index.html.tpl
@@ -26,6 +26,7 @@
     <script type="text/javascript">
     Proxmox = {
        Setup: { auth_cookie_name: 'PVEAuthCookie' },
+       defaultLang: '[% lang %]',
        UserName: '[% username %]',
        CSRFPreventionToken: '[% token %]'
     };

diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index 683fb54cfa3eb515b71049edf1797a78f85a629d..3ab5173cd2f1be902500689728ccf5cab16b621e 100644 (file)
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -164,7 +164,7 @@ Ext.define('PVE.window.LoginWindow', {
            {
                xtype: 'proxmoxLanguageSelector',
                fieldLabel: gettext('Language'),
-               value: Ext.util.Cookies.get('PVELangCookie') || 'en',
+               value: Ext.util.Cookies.get('PVELangCookie') || Proxmox.defaultLang || 'en',
                name: 'lang',
                reference: 'langField',
                submitValue: false