Import Cliqz search overlay module

app/content-scripts/content_script_bundle.js

@@ -13,6 +13,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0
  */
+
 /**
  * @namespace CliqzContentScript
  */

manifest.json

@@ -13,6 +13,8 @@
 	"version_name": "8.4.3",
 	"default_locale": "en",
 	"description": "__MSG_short_description__",
+	"debug": true,
+	"log": true,
 	"icons": {
 		"16": "app/images/icon16.png",
 		"48": "app/images/icon48.png",

package.json

@@ -24,7 +24,7 @@
     "docs": "jsdoc -c jsdoc.json -d docs -r",
     "leet": "node ./tools/leet/leet-en.js",
     "leet.reset": "node ./tools/leet/leet-reset.js",
-    "postinstall": "vendor-copy"
+    "postinstall": "vendor-copy && bash ./tools/merge-locales.sh"
   },
   "vendorCopy": [
     {

src/background.js

@@ -1208,6 +1208,14 @@ function setupABTest() {
 	if (abtest.hasTest('antitracking_whitelist2')) {
 		prefs.set('attrackBloomFilter', false);
 	}
+	// overlay search AB test
+	if (abtest.hasTest('overlay_search')) {
+		cliqz.enableModule('search');
+		cliqz.enableModule('overlay');
+	} else {
+		cliqz.disableModule('search');
+		cliqz.disableModule('overlay');
+	}
 }
 
 /**

tools/merge-locales.sh

@@ -0,0 +1,16 @@
+for lang in `ls ./cliqz/static/locale`
+do
+	# filter out only language folder
+	if [ ! -d "./cliqz/static/locale/$lang" ]; then
+		continue;
+	fi
+	# filter out language folders supported by ghostery
+
+	if [ ! -d "_locales/$lang" ]; then
+		continue;
+	fi
+
+	echo "Merging language file: $lang"
+	jq -s '.[0] + .[1]' "cliqz/static/locale/$lang/messages.json" "_locales/$lang/messages.json" > "_locales/$lang/messages.temp.json"
+	mv "_locales/$lang/messages.temp.json" "_locales/$lang/messages.json"
+done