Bug 1489570 - Port bug 1455649 part 4 to TB: Switch Preferences to use DocumentL10n API. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Fri, 07 Sep 2018 18:56:05 +0200
changeset 33091 38e2a60486af46320c357b412e42a0bba97ffca6
parent 33090 489af20156c6c8b5077faf5ab918a05fb57ced41
child 33092 5eade664a1a913ccd1497f8d05ec5b8aa4df60a9
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersjorgk
bugs1489570, 1455649
Bug 1489570 - Port bug 1455649 part 4 to TB: Switch Preferences to use DocumentL10n API. r=jorgk
mail/components/preferences/aboutPreferences.xul
mail/components/preferences/fonts.xul
mail/components/preferences/messengerLanguages.xul
--- a/mail/components/preferences/aboutPreferences.xul
+++ b/mail/components/preferences/aboutPreferences.xul
@@ -29,20 +29,21 @@
 #else
          title="&prefWindow.titleMAC;">
 #endif
 #endif
 
   <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundlePreferences"
                 src="chrome://messenger/locale/preferences/preferences.properties"/>
-  <link rel="localization" href="branding/brand.ftl"/>
-  <link rel="localization" href="messenger/preferences/preferences.ftl"/>
-  <link rel="localization" href="messenger/preferences/fonts.ftl"/>
-  <script type="application/javascript" src="chrome://global/content/l10n.js"/>
+  <linkset>
+    <link rel="localization" href="branding/brand.ftl"/>
+    <link rel="localization" href="messenger/preferences/preferences.ftl"/>
+    <link rel="localization" href="messenger/preferences/fonts.ftl"/>
+  </linkset>
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
   <script type="application/javascript" src="chrome://messenger/content/preferences/preferences.js"/>
   <script type="application/javascript" src="chrome://messenger/content/preferences/subdialogs.js"/>
 
 #include general.inc.xul
 #include display.inc.xul
--- a/mail/components/preferences/fonts.xul
+++ b/mail/components/preferences/fonts.xul
@@ -24,20 +24,21 @@
   <keyset>
     <key data-l10n-id="fonts-window-close" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <vbox id="FontsDialogPane" class="prefpane largeDialogContainer">
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
     <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-    <link rel="localization" href="messenger/preferences/fonts.ftl"/>
-    <script type="application/javascript" src="chrome://global/content/l10n.js"/>
     <script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
     <script type="application/javascript" src="chrome://messenger/content/preferences/fonts.js"/>
+    <linkset>
+      <link rel="localization" href="messenger/preferences/fonts.ftl"/>
+    </linkset>
 
     <groupbox>
       <caption>
         <hbox align="center">
           <label value="&language.label;" accesskey="&language.accesskey;"
                  control="selectLangs"/>
         </hbox>
         <menulist id="selectLangs" onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();"
--- a/mail/components/preferences/messengerLanguages.xul
+++ b/mail/components/preferences/messengerLanguages.xul
@@ -11,19 +11,20 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         data-l10n-id="messenger-languages-window"
         data-l10n-attrs="title, style"
         buttons="accept,cancel"
         role="dialog"
         onload="gMessengerLanguagesDialog.onLoad();"
         onbeforeaccept="return gMessengerLanguagesDialog.beforeAccept();">
 
-  <link rel="localization" href="branding/brand.ftl"/>
-  <link rel="localization" href="messenger/preferences/languages.ftl"/>
-  <script type="application/javascript" src="chrome://global/content/l10n.js"></script>
+  <linkset>
+    <link rel="localization" href="branding/brand.ftl"/>
+    <link rel="localization" href="messenger/preferences/languages.ftl"/>
+  </linkset>
 
   <script type="application/javascript" src="chrome://messnger/content/utilityOverlay.js"/>
   <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
   <script type="application/javascript" src="chrome://messenger/content/preferences/messengerLanguages.js"/>
 
   <description data-l10n-id="messenger-languages-description"/>
 
   <grid flex="1">