safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-12 07:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-526: Update webapp to angular 1.6.9.

Browse Source
This commit is contained in:
James Muehlner
2018-04-25 22:25:02 -07:00
parent 03281667b4
commit b3eeb36b87
36 changed files with 301 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
guacamole/src/main/webapp/app/locale/services/translationLoader.js
View File

@@ -74,7 +74,7 @@ angular.module('locale').factory('translationLoader', ['$injector', function tra
languageService.getLanguages()
// Attempt to retrieve translation if language is supported
.success(function retrievedLanguages(languages) {
.then(function retrievedLanguages(languages) {
// Skip retrieval if language is not supported
if (!(currentKey in languages)) {
@@ -90,18 +90,17 @@ angular.module('locale').factory('translationLoader', ['$injector', function tra
})
// Resolve promise if translation retrieved successfully
.success(function translationFileRetrieved(translation) {
deferred.resolve(translation);
})
.then(function translationFileRetrieved(request) {
deferred.resolve(request.data);
},
// Retry with remaining languages if translation file could not be
// retrieved
.error(tryNextTranslation);
})
tryNextTranslation);
},
// Retry with remaining languages if translation does not exist
.error(tryNextTranslation);
tryNextTranslation);
};