Issue 2375 - Implement "Blocking lists" section in new options page

i18n.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 47 matching lines @@
   }
 
   while (element.lastChild)
     element.removeChild(element.lastChild);
   processString(ext.i18n.getMessage(stringName, arguments), element);
 }
 
 // Loads i18n strings
 function loadI18nStrings()
 {
-  var nodes = document.querySelectorAll("[class^='i18n_']");
-  for(var i = 0; i < nodes.length; i++)
+  function addI18nStringsToElements(nodes)

[Thomas Greiner, 2016/01/25 15:40:29]

Detail: You're calling them "elements" everywhere else so why go with "node"
here?

[saroyanm, 2016/01/26 18:36:16]

Done.

   {
-    var node = nodes[i];
-    var arguments = JSON.parse("[" + node.textContent + "]");
-    if (arguments.length == 0)
-      arguments = null;
+    for(var i = 0; i < nodes.length; i++)
+    {
+      var node = nodes[i];
+      var arguments = JSON.parse("[" + node.textContent + "]");
+      if (arguments.length == 0)
+        arguments = null;
 
-    var className = node.className;
-    if (className instanceof SVGAnimatedString)
-      className = className.animVal;
-    var stringName = className.split(/\s/)[0].substring(5);
+      var className = node.className;
+      if (className instanceof SVGAnimatedString)
+        className = className.animVal;
+      var stringName = className.split(/\s/)[0].substring(5);
 
-    ext.i18n.setElementText(node, stringName, arguments);
+      ext.i18n.setElementText(node, stringName, arguments);
+    }
+  }
+  addI18nStringsToElements(document.querySelectorAll("[class^='i18n_']"));

[Thomas Greiner, 2016/01/25 15:40:29]

Detail: You're always calling this function using the same selector so to avoid
duplication I'd suggest instead only passing the container element and querying
for elements inside `addI18nStringsToElements()`.

[saroyanm, 2016/01/26 18:36:16]

Done.

+  var templates = document.querySelectorAll("template");

[Thomas Greiner, 2016/01/25 15:40:30]

Detail: Please add a short comment to explain why this is necessary.

[saroyanm, 2016/01/26 18:36:17]

Done.

+  for (var i = 0; i < templates.length; i++)
+  {
+    var nodes = templates[i].content.querySelectorAll("[class^='i18n_']");
+    if (nodes.length > 0)
+      addI18nStringsToElements(nodes);
   }
 }
 
 // Provides a more readable string of the current date and time
 function i18n_timeDateStrings(when)
 {
   var d = new Date(when);
   var timeString = d.toLocaleTimeString();
 
   var now = new Date();
   if (d.toDateString() == now.toDateString())
     return [timeString];
   else
     return [timeString, d.toLocaleDateString()];
 }
 
 // Fill in the strings as soon as possible
 window.addEventListener("DOMContentLoaded", loadI18nStrings, true);