Bug 1002772 - Don't set document's lang and dir in Homescreen. r=ving…

…tetun
mozilla-b2g · May 5, 2014 · 481fadf · 481fadf
1 parent e8a08a3
commit 481fadf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/apps/homescreen/js/homescreen.js b/apps/homescreen/js/homescreen.js
@@ -5,14 +5,8 @@ var Homescreen = (function() {
   var mode = 'normal';
   var origin = document.location.protocol + '//homescreen.' +
     document.location.host.replace(/(^[\w\d]+.)?([\w\d]+.[a-z]+)/, '$2');
-  setLocale();
   var iconGrid = document.getElementById('icongrid');
 
-  navigator.mozL10n.ready(function localize() {
-    setLocale();
-    GridManager.localize();
-  });
-
   var initialized = false;
   onConnectionChange(navigator.onLine);
 
@@ -38,6 +32,8 @@ var Homescreen = (function() {
     };
 
     GridManager.init(options, function gm_init() {
+      navigator.mozL10n.ready(GridManager.localize.bind(GridManager));
+
       window.addEventListener('hashchange', function() {
         if (!window.location.hash.replace('#', '')) {
           return;
@@ -136,12 +132,6 @@ var Homescreen = (function() {
     }
   });
 
-  function setLocale() {
-    // set the 'lang' and 'dir' attributes to <html> when the page is translated
-    document.documentElement.lang = navigator.mozL10n.language.code;
-    document.documentElement.dir = navigator.mozL10n.language.direction;
-  }
-
   function onConnectionChange(isOnline) {
     var mode = isOnline ? 'online' : 'offline';
     document.body.dataset.online = mode;

diff --git a/apps/homescreen/test/unit/mock_l10n.js b/apps/homescreen/test/unit/mock_l10n.js
@@ -19,7 +19,8 @@ window.navigator.mozL10n = {
     };
   },
 
-  ready: function() {
+  ready: function(callback) {
+    setTimeout(callback);
   },
 
   language: {