Bug 1336434 - "Your Top Sites" heading should say "Top Sites" instead when using the default set. r=Gijs

MozReview-Commit-ID: 3TXSxKSqgJy

--HG--
extra : rebase_source : 1cf665a58e9f9d4bd26714234a8016c2e16928ff

browser/base/content/newtab/grid.js

@@ -142,9 +142,13 @@ var gGrid = {
 
     // Create sites.
     let numLinks = Math.min(links.length, cells.length);
+    let hasHistoryTiles = false;
     for (let i = 0; i < numLinks; i++) {
       if (links[i]) {
         this.createSite(links[i], cells[i]);
+        if (links[i].type == "history") {
+          hasHistoryTiles = true;
+        }
       }
     }
 
@@ -153,6 +157,9 @@ var gGrid = {
       this._gridDefaultContent.nextSibling.remove();
     }
     this._node.appendChild(fragment);
+
+    document.getElementById("topsites-heading").textContent =
+      newTabString(hasHistoryTiles ? "userTopSites.heading" : "defaultTopSites.heading");
   },
 
   /**

browser/base/content/newtab/newTab.xhtml

@@ -80,7 +80,7 @@
     <div id="newtab-horizontal-margin">
       <div class="newtab-side-margin"/>
       <div id="newtab-grid">
-        <h1 id="topsites-heading">&newtab.topSites.heading;</h1>
+        <h1 id="topsites-heading"/>
       </div>
       <div class="newtab-side-margin"/>
     </div>

browser/locales/en-US/chrome/browser/newTab.dtd

@@ -4,7 +4,6 @@
 
 <!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "New Tab">
-<!ENTITY newtab.topSites.heading "Your Top Sites">
 <!ENTITY newtab.customize.classic "Show your top sites">
 <!ENTITY newtab.customize.cog.enhanced "Include suggested sites">
 <!ENTITY newtab.customize.cog.title2 "NEW TAB CONTROLS">

browser/locales/en-US/chrome/browser/newTab.properties

@@ -2,6 +2,9 @@
 # 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/.
 
+newtab.defaultTopSites.heading=Top Sites
+newtab.userTopSites.heading=Your Top Sites
+
 newtab.pin=Pin this site at its current position
 newtab.unpin=Unpin this site
 newtab.block=Remove this site