Merge pull request #7867 from gtorodelvalle/dialer-bug-835329-localiz…

…ation-not-loading-in-attention-screen

Bug 835329 - [DIALER] Timer is not appearing during an outgoing call (r=@etiennesegonzac)(cherry picked from commit 345162a)

apps/communications/dialer/js/lazy_l10n.js

@@ -17,14 +17,13 @@ var LazyL10n = {
     // the l10n resources
     var l10nScript = document.createElement('script');
     l10nScript.src = '/shared/js/l10n.js';
-    l10nScript.onload = this._finalize.bind(this, callback);
     document.head.appendChild(l10nScript);
+    this._waitForLoad(callback);
+    this._inDOM = true;
 
     var l10nDateScript = document.createElement('script');
     l10nDateScript.src = '/shared/js/l10n_date.js';
     document.head.appendChild(l10nDateScript);
-
-    this._inDOM = true;
   },
 
   _waitForLoad: function ll10n_waitForLoad(callback) {

shared/js/l10n.js

@@ -947,7 +947,8 @@
 
   // the B2G build system doesn't expose any `document'...
   if (typeof(document) !== 'undefined') {
-    if (document.readyState === 'complete') {
+    if (document.readyState === 'complete' ||
+      document.readyState === 'interactive') {
       window.setTimeout(l10nStartup);
     } else {
       document.addEventListener('DOMContentLoaded', l10nStartup);