From d841bc43f83fef56b14dc4cfef3de6fffc7e303e Mon Sep 17 00:00:00 2001 From: agrajaghh Date: Thu, 6 Oct 2016 12:37:34 +0200 Subject: [PATCH] reload systeminfo after language change --- .../ngax/scripts/services/SystemInfo.js | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/Duplicati/Server/webroot/ngax/scripts/services/SystemInfo.js b/Duplicati/Server/webroot/ngax/scripts/services/SystemInfo.js index dee5a8590..15486cce6 100644 --- a/Duplicati/Server/webroot/ngax/scripts/services/SystemInfo.js +++ b/Duplicati/Server/webroot/ngax/scripts/services/SystemInfo.js @@ -43,12 +43,12 @@ backupApp.service('SystemInfo', function($rootScope, $timeout, $cookies, AppServ function reloadTexts() { state.backendgroups = this.backendgroups = { - std: { - 'ftp': null, - 'ssh': null, - 'webdav': null, - 'openstack': gettextCatalog.getString('OpenStack Object Storage / Swift'), - 's3': gettextCatalog.getString('S3 Compatible'), + std: { + 'ftp': null, + 'ssh': null, + 'webdav': null, + 'openstack': gettextCatalog.getString('OpenStack Object Storage / Swift'), + 's3': gettextCatalog.getString('S3 Compatible'), 'aftp': gettextCatalog.getString('FTP (Alternative)') }, local: {'file': null}, @@ -107,21 +107,24 @@ backupApp.service('SystemInfo', function($rootScope, $timeout, $cookies, AppServ this.notifyChanged = function() { $rootScope.$broadcast('systeminfochanged'); }; + + uiLanguage = $cookies.get('ui-locale'); + if ((uiLanguage || '').trim().length == 0) { + gettextCatalog.setCurrentLanguage(state.BrowserLocale.Code.replace("-", "_")); + } else { + gettextCatalog.setCurrentLanguage(uiLanguage); + } - AppService.get('/systeminfo').then(function(data) { + function loadSystemInfo() { + AppService.get('/systeminfo').then(function(data) { + angular.copy(data.data, state); - angular.copy(data.data, state); - - uiLanguage = $cookies.get('ui-locale'); - if ((uiLanguage || '').trim().length == 0) { - gettextCatalog.setCurrentLanguage(state.BrowserLocale.Code.replace("-", "_")); - } else { - gettextCatalog.setCurrentLanguage(uiLanguage); - } - - reloadTexts(); - reloadBackendConfig(); - $rootScope.$broadcast('systeminfochanged'); - - }, AppUtils.connectionError) + reloadTexts(); + reloadBackendConfig(); + $rootScope.$broadcast('systeminfochanged'); + }, AppUtils.connectionError) + } + + loadSystemInfo(); + $rootScope.$on('gettextLanguageChanged', loadSystemInfo); });