From 8c75b8b0dd4b7a30fae1b54123da35d799c704b9 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Mon, 23 Jun 2014 21:09:31 -0400
Subject: [PATCH] fixed "raced condition" between two onLoad listener

---
 3p-filters.html  | 2 +-
 js/3p-filters.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/3p-filters.html b/3p-filters.html
index 9eb4bb160..ef01345c6 100644
--- a/3p-filters.html
+++ b/3p-filters.html
@@ -36,7 +36,7 @@ ul > li {
 <p id="3pListsOfBlockedHostsPrompt2"></p>
 <ul id="blacklistTemplate" style="display:none">
     <li class="blacklistDetails"><input type="checkbox">&thinsp;<a href="" type="text/plain"></a>: 
-    <span class="dim" data-i18n="3pListsOfBlockedHostsPerListStats"></span>
+    <span class="dim"></span>
 </ul>
 <ul id="blacklists" style="margin:0.5em 0 0 0;padding-left:1em;list-style-type:none">
     <li style="margin-top:0.75em"><input type="checkbox" id="parseAllABPHideFilters"><span data-i18n="3pParseAllABPHideFiltersPrompt1"></span>
diff --git a/js/3p-filters.js b/js/3p-filters.js
index 5dc1eb7e8..c5e346f1b 100644
--- a/js/3p-filters.js
+++ b/js/3p-filters.js
@@ -134,7 +134,7 @@ function renderBlacklists() {
         child.attr('href', encodeURI(blacklistHref));
         child.html(prettifyListName(blacklist.title, blacklistHref));
         child = $('span', li);
-        text = child.text()
+        text = chrome.i18n.getMessage('3pListsOfBlockedHostsPerListStats')
             .replace('{{used}}', !blacklist.off && !isNaN(+blacklist.entryUsedCount) ? renderNumber(blacklist.entryUsedCount) : '0')
             .replace('{{total}}', !isNaN(+blacklist.entryCount) ? renderNumber(blacklist.entryCount) : '?')
             ;
@@ -220,7 +220,7 @@ function abpHideFiltersCheckboxChanged() {
 
 /******************************************************************************/
 
-$(function() {
+window.addEventListener('load', function() {
     // Handle user interaction
     $('#blacklists').on('change', '.blacklistDetails', selectedBlacklistsChanged);
     $('#blacklistsApply').on('click', blacklistsApplyHandler);