Bug 1316720 - Populate all documents using browserMountPoints.inc with l20n.js draft
authorZibi Braniecki <gandalf@mozilla.com>
Thu, 10 Nov 2016 13:59:47 -0800
changeset 437455 ed648030a871e7260c1466c3ab54733f9a65039a
parent 437261 3466e6bc9874e5d7e53649d594ab70af9af2e358
child 536637 cc90b8114d8cf998e765939945dbfb9fd2107336
push id35410
push userzbraniecki@mozilla.com
push dateThu, 10 Nov 2016 22:00:31 +0000
bugs1316720
milestone52.0a1
Bug 1316720 - Populate all documents using browserMountPoints.inc with l20n.js MozReview-Commit-ID: 9djrIM2My70
browser/base/content/aboutDialog.xul
browser/base/content/downloadManagerOverlay.xul
browser/base/content/hiddenWindow.xul
browser/base/content/pageinfo/pageInfo.xul
browser/base/content/softwareUpdateOverlay.xul
browser/components/places/content/places.xul
browser/components/shell/content/setDesktopBackground.xul
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -11,16 +11,22 @@
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % aboutDialogDTD SYSTEM "chrome://browser/locale/aboutDialog.dtd" >
 %aboutDialogDTD;
 ]>
 
 #ifdef XP_MACOSX
+
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 #endif
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="aboutDialog"
         windowtype="Browser:About"
         onload="init(event);"
--- a/browser/base/content/downloadManagerOverlay.xul
+++ b/browser/base/content/downloadManagerOverlay.xul
@@ -6,16 +6,21 @@
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 
 <overlay id="downloadManagerOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <window id="downloadManager">
 
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 #include browserMountPoints.inc
 
 <script type="application/javascript"><![CDATA[
   window.addEventListener("load", function(event) {
     // Bug 405696: Map Edit -> Find command to the download manager's command
     var findMenuItem = document.getElementById("menu_find");
     findMenuItem.setAttribute("command", "cmd_findDownload");
     findMenuItem.setAttribute("key", "key_findDownload");
--- a/browser/base/content/hiddenWindow.xul
+++ b/browser/base/content/hiddenWindow.xul
@@ -8,13 +8,18 @@
 #ifdef XP_MACOSX
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 <?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
 
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 #include browserMountPoints.inc
 
 </window>
 
 #endif
--- a/browser/base/content/pageinfo/pageInfo.xul
+++ b/browser/base/content/pageinfo/pageInfo.xul
@@ -7,16 +7,22 @@
 <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
   %pageInfoDTD;
 ]>
 
 #ifdef XP_MACOSX
+
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 #endif
 
 <window id="main-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="Browser:page-info"
   onload="onLoadPageInfo()"
   onunload="onUnloadPageInfo()"
--- a/browser/base/content/softwareUpdateOverlay.xul
+++ b/browser/base/content/softwareUpdateOverlay.xul
@@ -6,13 +6,18 @@
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 
 <overlay id="softwareUpdateOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <window id="updates">
 
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 #include browserMountPoints.inc
 
 </window>
 
 </overlay>
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -9,16 +9,22 @@
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
 <?xml-stylesheet href="chrome://browser/skin/places/organizer.css"?>
 
 <?xul-overlay href="chrome://browser/content/places/editBookmarkOverlay.xul"?>
 
 #ifdef XP_MACOSX
+
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 #else
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
 #endif
 
 <!DOCTYPE window [
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/browser/components/shell/content/setDesktopBackground.xul
@@ -5,16 +5,22 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://browser/locale/setDesktopBackground.dtd">
 
 #ifdef XP_MACOSX
+
+<link rel="localization" href="/browser/brand.ftl"/>
+<link rel="localization" href="/browser/menubar.ftl"/>
+<link rel="localization" href="/browser/toolbar.ftl"/>
+<script type="application/javascript" src="chrome://global/content/l20n.js"/>
+
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 #endif
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         windowtype="Shell:SetDesktopBackground"
 #ifndef XP_MACOSX
         buttons="accept,cancel"