SONAR-5334 Remove localStorage based translation methods

diff --git a/sonar-server/src/main/coffee/coding-rules/app.coffee b/sonar-server/src/main/coffee/coding-rules/app.coffee
index 3c3ce98b880604ea4fb103890aab4595d6716884..a0ab8754246fb1bbeabb20761a81fc36797d0db5 100644 (file)
--- a/sonar-server/src/main/coffee/coding-rules/app.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/app.coffee
@@ -481,7 +481,7 @@ requirejs [
   # Message bundles
   l10nXHR = window.requestMessages()
 
-  jQuery.when(appXHR, l10nXHR).done ->
+  jQuery.when(l10nXHR, appXHR).done ->
       # Remove the initial spinner
       jQuery('#coding-rules-page-loader').remove()
 

diff --git a/sonar-server/src/main/js/translate.js b/sonar-server/src/main/js/translate.js
index 0681b727d4625c6d46e4be4d447989ea4e320ab8..b185c0c447c8375db59ccf4c65b5365e785a44ab 100644 (file)
--- a/sonar-server/src/main/js/translate.js
+++ b/sonar-server/src/main/js/translate.js
@@ -5,7 +5,7 @@
     }
   };
 
-  window.t2 = function() {
+  window.t = function() {
     if (!window.messages) {
       return window.translate.apply(this, arguments);
     }
@@ -18,26 +18,10 @@
     return (window.messages && window.messages[key]) || key;
   };
 
-  window.t = function() {
-    var args = Array.prototype.slice.call(arguments, 0),
-        key = args.join('.'),
-        storageKey = 'l10n.' + key,
-        message = localStorage.getItem(storageKey);
-    if (!message) {
-      return window.t2.apply(this, arguments);
-    }
-    return message;
-  };
-
-
   window.tp = function() {
     var args = Array.prototype.slice.call(arguments, 0),
-        key = args.shift(),
-        storageKey = 'l10n.' + key,
-        message = localStorage.getItem(storageKey);
-    if (!message && window.messages) {
+      key = args.shift(),
       message = window.messages[key];
-    }
     if (message) {
       args.forEach(function(p, i) {
         message = message.replace('{' + i + '}', p);