Issue 4580 - Replace ext.i18n.getMessage with i18n.getMessage

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 (function()
 {
+  if (typeof chrome == "undefined")
+    window.chrome = {};
+
   if (typeof ext == "undefined")
     window.ext = {};
 
   function Page(source)
   {
     this._source = source;
   }
   Page.prototype =
   {
     sendMessage(message)
@@ skipping 119 matching lines @@
       return;
 
     let rawCatalog = JSON.parse(xhr.responseText);
     for (let msgId in rawCatalog)
     {
       if (!(msgId in catalog))
         catalog[msgId] = parseMessage(rawCatalog[msgId]);
     }
   };
 
-  window.ext.i18n = {
-    locale: locales[0],
+  chrome.i18n = {

[Sebastian Noack, 2017/10/09 18:43:54]

Shouldn't this rather be browser.i18n, now where we are going to use the
extension API, though the "browser" namespace (rather than "chrome")?

[Manish Jethani, 2017/10/09 18:47:02]

Yes, assuming that one lands first.

+    getUILanguage()
+    {
+      return locales[0].replace(/_/g, "-");
+    },
     getMessage(msgId, substitutions)
     {
       while (true)
       {
         let message = catalog[msgId];
         if (message)
         {
           let text = message[0];
           let placeholders = message[1];
 
           if (!(substitutions instanceof Array))
             substitutions = [substitutions];
 
           for (let i = 0; i < placeholders.length; i++)
             text = replacePlaceholder(text, placeholders[i], substitutions[i]);
 
           return text;
         }
 
         if (locales.length == 0)
           return "";
 
         let locale = locales.shift();
         readCatalog(locale, "common.json");
         readCatalog(locale, catalogFile);
       }
     }
   };
 }());