From 1c5933c96cd68f353165a02a76dd47760e8d493e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Nov 2014 14:49:15 +0100
Subject: [PATCH] Better use of promise in OC.L10N.load()

---
 core/js/l10n.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/js/l10n.js b/core/js/l10n.js
index 2db4609ded..3e37da0136 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);
 	},
 
 	/**