Issue 5860 - options page is broken in test enviroment

ext/common.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 65 matching lines @@
       if ("_extWrapper" in listener)
         window.removeEventListener("message", listener._extWrapper, false);
     }
   };
 
   /* I18n */
 
   let getLocaleCandidates = function(selectedLocale)
   {
     let candidates = [];
-    let defaultLocale = "en-US";
+    let defaultLocale = "en_US";
 
-    // e.g. "ja-jp-mac" -> "ja-JP", note that the part after the second
+    // e.g. "ja_jp_mac" -> "ja_JP", note that the part after the second
     // dash is dropped, since we only support language and region
-    let parts = selectedLocale.split("-");
+    let parts = selectedLocale.split("_");
     let language = parts[0];
     let region = (parts[1] || "").toUpperCase();
 
     if (region)
-      candidates.push(language + "-" + region);
+      candidates.push(language + "_" + region);
 
     candidates.push(language);
 
     if (candidates.indexOf(defaultLocale) == -1)
       candidates.push(defaultLocale);
 
     return candidates;
   };
 
   let selectedLocale = window.navigator.language;
-  let match = /[?&]locale=([\w-]+)/.exec(window.location.search);
+  let match = /[?&]locale=([\w_]+)/.exec(window.location.search);
   if (match)
     selectedLocale = match[1];
 
   let locales = getLocaleCandidates(selectedLocale);
   let catalog = Object.create(null);
   let catalogFile = window.location.pathname.replace(/.*\//, "")
     .replace(/\..*/, "") + ".json";
 
   let replacePlaceholder = function(text, placeholder, content)
   {
@@ skipping 40 matching lines @@
     for (let msgId in rawCatalog)
     {
       if (!(msgId in catalog))
         catalog[msgId] = parseMessage(rawCatalog[msgId]);
     }
   };
 
   chrome.i18n = {
     getUILanguage()
     {
-      return locales[0].replace(/_/g, "-");
+      return locales[0];
     },
     getMessage(msgId, substitutions)
     {
       while (true)
       {
         let message = catalog[msgId];
         if (message)
         {
           let text = message[0];
           let placeholders = message[1];
@@ skipping 10 matching lines @@
         if (locales.length == 0)
           return "";
 
         let locale = locales.shift();
         readCatalog(locale, "common.json");
         readCatalog(locale, catalogFile);
       }
     }
   };
 }());