summaryrefslogtreecommitdiffstats
path: root/core/js/l10n.js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js/l10n.js')
-rw-r--r--core/js/l10n.js21
1 files changed, 8 insertions, 13 deletions
diff --git a/core/js/l10n.js b/core/js/l10n.js
index 2db4609ded2..3e37da01369 100644
--- a/core/js/l10n.js
+++ b/core/js/l10n.js
@@ -44,22 +44,17 @@ OC.L10N = {
}
var self = this;
- var deferred = $.Deferred();
var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json');
// load JSON translation bundle per AJAX
- $.get(url,
- function(result) {
- if (result.translations) {
- self.register(appName, result.translations, result.pluralForm);
- }
- if (callback) {
- callback();
- deferred.resolve();
- }
- }
- );
- return deferred.promise();
+ return $.get(url)
+ .then(
+ function(result) {
+ if (result.translations) {
+ self.register(appName, result.translations, result.pluralForm);
+ }
+ })
+ .then(callback);
},
/**