Issue 5701 - Inconsistent forum links and DNT link

new-options.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 847 matching lines @@
     }, false);
 
     getDocLink("contribute", (link) =>
     {
       E("contribute").href = link;
     });
     getDocLink("acceptable_ads_criteria", (link) =>
     {
       setLinks("enable-aa-description", link);
     });
-
-    // Get browser specific links
-    ext.backgroundPage.sendMessage({
-      type: "app.get",
-      what: "browserInfo"
-    },
-    ({platform, application}) =>
-    {
-      if (platform == "chromium" && application != "opera")
-        application = "chrome";
-      else if (platform == "gecko")
-        application = "firefox";
-
-      getDocLink(application + "_support", url =>
-      {
-        setLinks("visit-forum", url);
-      });
-
-      getDocLink("adblock_plus_" + application + "_dnt", url =>
-      {
-        setLinks("dnt", url);
-      });
+    getDocLink("adblock_plus_{browser}_dnt", url =>
+    {
+      setLinks("dnt", url);
     });
 
     // Advanced tab
     let customize = document.querySelectorAll("#customize li[data-pref]");
     customize = Array.prototype.map.call(customize, (checkbox) =>
     {
       return checkbox.getAttribute("data-pref");
     });
     for (let key of customize)
     {
@@ skipping 29 matching lines @@
     {
       setLinks("report-issue", link);
     });
     getDocLink("adblock_plus_report_ad", (link) =>
     {
       setLinks("report-ad", link);
     });
     getDocLink("adblock_plus_report_bug", (link) =>
     {
       setLinks("report-bug", link);
+    });
+    getDocLink("{browser}_support", url =>
+    {
+      setLinks("visit-forum", url);
     });
     getDocLink("social_twitter", (link) =>
     {
       E("twitter").setAttribute("href", link);
     });
     getDocLink("social_facebook", (link) =>
     {
       E("facebook").setAttribute("href", link);
     });
     getDocLink("social_gplus", (link) =>
@@ skipping 447 matching lines @@
   });
   ext.backgroundPage.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }