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

GUAC-1345: Do not attempt to retrieve translation files for languages which are not explicitly listed as available by the REST API.

Browse Source
This commit is contained in:
Michael Jumper
2015-10-12 17:11:46 -07:00
parent c57893f5d3
commit 35a828bfb6
1 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,9 +29,10 @@
angular.module('locale').factory('translationLoader', ['$injector', function translationLoader($injector) { angular.module('locale').factory('translationLoader', ['$injector', function translationLoader($injector) {
// Required services // Required services
var $http = $injector.get('$http'); var $http = $injector.get('$http');
var $q = $injector.get('$q'); var $q = $injector.get('$q');
var cacheService = $injector.get('cacheService'); var cacheService = $injector.get('cacheService');
var languageService = $injector.get('languageService');
/** /**
* Satisfies a translation request for the given key by searching for the * Satisfies a translation request for the given key by searching for the
@@ -62,22 +63,48 @@ angular.module('locale').factory('translationLoader', ['$injector', function tra
return; return;
} }
// Attempt to retrieve language /**
$http({ * Continues trying possible translation files until no possibilities
cache : cacheService.languages, * exist.
method : 'GET', *
url : 'translations/' + encodeURIComponent(currentKey) + '.json' * @private
}) */
var tryNextTranslation = function tryNextTranslation() {
// Resolve promise if translation retrieved successfully
.success(function translationFileRetrieved(translation) {
deferred.resolve(translation);
})
// Retry with remaining languages if translation file could not be retrieved
.error(function translationFileUnretrievable() {
satisfyTranslation(deferred, requestedKey, remainingKeys); satisfyTranslation(deferred, requestedKey, remainingKeys);
}); };
// Retrieve list of supported languages
languageService.getLanguages()
// Attempt to retrieve translation if language is supported
.success(function retrievedLanguages(languages) {
// Skip retrieval if language is not supported
if (!(currentKey in languages)) {
tryNextTranslation();
return;
}
// Attempt to retrieve language
$http({
cache : cacheService.languages,
method : 'GET',
url : 'translations/' + encodeURIComponent(currentKey) + '.json'
})
// Resolve promise if translation retrieved successfully
.success(function translationFileRetrieved(translation) {
deferred.resolve(translation);
})
// Retry with remaining languages if translation file could not be
// retrieved
.error(tryNextTranslation);
})
// Retry with remaining languages if translation does not exist
.error(tryNextTranslation);
}; };