dotlambda
diff --git a/‎.gitmodules‎
Lines changed: 4 additions & 0 deletions b/‎.gitmodules‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎chromium/background.js‎
Lines changed: 17 additions & 6 deletions b/‎chromium/background.js‎
Lines changed: 17 additions & 6 deletions
diff --git a/‎chromium/manifest.json‎
Lines changed: 1 addition & 2 deletions b/‎chromium/manifest.json‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎chromium/rule_list.js‎
Lines changed: 0 additions & 3 deletions b/‎chromium/rule_list.js‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎chromium/util.js‎
Lines changed: 8 additions & 6 deletions b/‎chromium/util.js‎
Lines changed: 8 additions & 6 deletions
diff --git a/‎https-everywhere-checker‎ b/‎https-everywhere-checker‎
diff --git a/‎https-everywhere-tests/test_profile_skeleton/prefs.js‎
Lines changed: 0 additions & 2 deletions b/‎https-everywhere-tests/test_profile_skeleton/prefs.js‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎makecrx.sh‎
Lines changed: 10 additions & 14 deletions b/‎makecrx.sh‎
Lines changed: 10 additions & 14 deletions
diff --git a/‎makexpi.sh‎
Lines changed: 16 additions & 0 deletions b/‎makexpi.sh‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎src/Changelog‎
Lines changed: 5 additions & 0 deletions b/‎src/Changelog‎
Lines changed: 5 additions & 0 deletions
@@ -5,3 +5,7 @@
 	path = https-everywhere-checker
 	url = https://github.com/jsha/https-everywhere-checker.git
 	branch = coverage
+[submodule "translations"]
+	path = translations
+	url = https://git.torproject.org/translation.git
+	branch = https_everywhere
@@ -4,7 +4,7 @@
  *
  * @param url: a relative URL to local XML
  */
-function getRuleXml(url) {
+function loadExtensionFile(url, returnType) {
   var xhr = new XMLHttpRequest();
   // Use blocking XHR to ensure everything is loaded by the time
   // we return.
@@ -14,14 +14,18 @@ function getRuleXml(url) {
   if (xhr.readyState != 4) {
     return;
   }
-  return xhr.responseXML;
+  if (returnType === 'xml') {
+    return xhr.responseXML;
+  }
+  return xhr.responseText;
 }
 
+
 // Rules are loaded here
 var all_rules = new RuleSets(navigator.userAgent, LRUCache, localStorage);
-for (var i = 0; i < rule_list.length; i++) {
-  all_rules.addFromXml(getRuleXml(rule_list[i]));
-}
+var rule_list = 'rules/default.rulesets';
+all_rules.addFromXml(loadExtensionFile(rule_list, 'xml'));
+
 
 var USER_RULE_KEY = 'userRules';
 // Records which tabId's are active in the HTTPS Switch Planner (see
@@ -504,7 +508,14 @@ function onBeforeRedirect(details) {
 }
 
 // Registers the handler for requests
-wr.onBeforeRequest.addListener(onBeforeRequest, {urls: ["https://*/*", "http://*/*"]}, ["blocking"]);
+// We listen to all HTTP hosts, because RequestFilter can't handle tons of url restrictions.
+wr.onBeforeRequest.addListener(onBeforeRequest, {urls: ["http://*/*"]}, ["blocking"]);
+
+// TODO: Listen only to the tiny subset of HTTPS hosts that we rewrite/downgrade.
+var httpsUrlsWeListenTo = ["https://*/*"];
+// See: https://developer.chrome.com/extensions/match_patterns
+wr.onBeforeRequest.addListener(onBeforeRequest, {urls: httpsUrlsWeListenTo}, ["blocking"]);
+
 
 // Try to catch redirect loops on URLs we've redirected to HTTPS.
 wr.onBeforeRedirect.addListener(onBeforeRedirect, {urls: ["https://*/*"]});
 
@@ -5,7 +5,6 @@
     "background": {
         "scripts": [
             "lru.js", 
-            "rule_list.js", 
             "rules.js", 
             "util.js", 
             "background.js"
@@ -40,5 +39,5 @@
         "<all_urls>"
     ], 
     "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", 
-    "version": "2015.7.17"
+    "version": "2015.8.13"
 }
@@ -1,14 +1,16 @@
-VERB=1;
-DBUG=2;
-INFO=3;
-NOTE=4;
-WARN=5;
+"use strict";
+
+var VERB=1;
+var DBUG=2;
+var INFO=3;
+var NOTE=4;
+var WARN=5;
 // FYI: Logging everything is /very/ slow. Chrome will log & buffer
 // these console logs even when the debug tools are closed. :(
 
 // TODO: Add an easy UI to change the log level.
 // (Developers can just type DEFAULT_LOG_LEVEL=1 in the console)
-DEFAULT_LOG_LEVEL=4;
+var DEFAULT_LOG_LEVEL=4;
 console.log("Hey developer! Want to see more verbose logging?");
 console.log("Type this into the console: DEFAULT_LOG_LEVEL=1");
 
 
@@ -6,8 +6,6 @@ user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
 // Show all logs.
 user_pref("extensions.https_everywhere.LogLevel", 0);
 user_pref("extensions.https_everywhere.log_to_stdout", true);
-// Allow running of Mixed Content Blocking tests.
-user_pref("extensions.https_everywhere.show_ruleset_tests", true);
 // Make it quicker to make manual config changes.
 user_pref("general.warnOnAboutConfig", false);
 // Minimize unnecesary requests.
 
@@ -24,22 +24,21 @@ RULESETS_UNVALIDATED="$PWD/pkg/rulesets.unvalidated.sqlite"
 RULESETS_SQLITE="$PWD/src/defaults/rulesets.sqlite"
 
 if [ -n "$1" ]; then
-  if [ "$1" = today ] ; then
-    python chromium/setversion.py
-  else
-    BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
-    SUBDIR=checkout
-    [ -d $SUBDIR ] || mkdir $SUBDIR
-    cp -r -f -a .git $SUBDIR
-    cd $SUBDIR
-    git reset --hard "$1"
-  fi
+  BRANCH=`git branch | head -n 1 | cut -d \  -f 2-`
+  SUBDIR=checkout
+  [ -d $SUBDIR ] || mkdir $SUBDIR
+  cp -r -f -a .git $SUBDIR
+  cd $SUBDIR
+  git reset --hard "$1"
 fi
 
 VERSION=`python -c "import json ; print(json.loads(open('chromium/manifest.json').read())['version'])"`
 
 echo "Building chrome version" $VERSION
 
+[ -d pkg ] || mkdir -p pkg
+[ -e pkg/crx ] && rm -rf pkg/crx
+
 # Only generate the sqlite database if any rulesets have changed. Tried
 # implementing this with make, but make is very slow with 15k+ input files.
 needs_update() {
@@ -50,14 +49,11 @@ if [ ! -f "$RULESETS_UNVALIDATED" ] || needs_update ; then
   # Build the SQLite DB even though we don't yet use it in the Chrome extension,
   # because trivial-validate.py depends on it.
   echo "Generating sqlite DB"
-  python2.7 ./utils/make-sqlite.py
-  bash utils/validate.sh
+  python2.7 ./utils/make-sqlite.py && bash utils/validate.sh
 fi
 
 sed -e "s/VERSION/$VERSION/g" chromium/updates-master.xml > chromium/updates.xml
 
-[ -d pkg ] || mkdir -p pkg
-[ -e pkg/crx ] && rm -rf pkg/crx
 mkdir -p pkg/crx/rules
 cd pkg/crx
 cp -a ../../chromium/* .
 
@@ -37,6 +37,21 @@ if [ -n "$1" ] && [ "$2" != "--no-recurse" ] ; then
   # Use the version of the build script that was current when that
   # tag/release/branch was made.
   ./makexpi.sh $1 --no-recurse || exit 1
+
+  # Check that all the string present in the English entities file are present in
+  # each other locale we use. A missing entity causes a nasty error at startup.
+  # Note that we only make this check when doing tagged builds, since otherwise
+  # the check would fail anytime someone adds a new string in the entities file,
+  # before it is included in Transifex. Once the new string is in the master
+  # branch, Transifex will automatically fill it in with the default English
+  # value in all the other locales.
+  if bash utils/compare-locales.sh pkg/$XPI_NAME.xpi >&2
+  then
+    echo Validation of included locales completed. >&2
+  else
+    die "Validation of locales failed."
+  fi
+
   # The fact that the above works even when the thing you are building predates
   # support for --no-recurse in this script is (1) non-intuitive; (2) crazy; and (3)
   # involves two pristine checkouts of $1 within each other
@@ -100,6 +115,7 @@ fi
 [ -d pkg ] || mkdir pkg
 [ -e pkg/xpi-eff ] && rm -rf pkg/xpi-eff
 cp -a src/ pkg/xpi-eff/
+cp -a translations/* pkg/xpi-eff/chrome/locale/
 rm -r pkg/xpi-eff/chrome/content/rules
 [ -e pkg/xpi-amo ] && rm -rf pkg/xpi-amo
 cp -a pkg/xpi-eff/ pkg/xpi-amo/
 
@@ -1,3 +1,8 @@
+Firefox 5.0.8 / Chrome-2015.8.13
+  * Ruleset fixes
+  * Restore checkbox icons on Firefox
+  * Add a link to the HTTPS Everywhere Atlas
+
 Firefox 5.0.7 / Chrome-2015.7.17
   * Ruleset fixes, in particular disable broken Netflix rule
   * Fix "Add a rule" functionality in Chrome.