Bug 1511170 - Port bug 1498448: Migrate Certificate Manager Dialog to use fluent for localization. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Thu, 29 Nov 2018 22:10:28 +0100
changeset 33821 57a3525213c488c59d860dccb21442233e1107df
parent 33820 27a12bd5adcafe52ebd5540269d45f119cf93b5c
child 33822 95ff25a433f1ccd0edad426c5b966459c0f9f085
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1511170, 1498448
Bug 1511170 - Port bug 1498448: Migrate Certificate Manager Dialog to use fluent for localization. r=jorgk
chat/content/account.xml
mail/components/im/content/imAccounts.xul
mailnews/extensions/newsblog/content/feed-subscriptions.xul
--- a/chat/content/account.xml
+++ b/chat/content/account.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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/. -->
 
 
 <!DOCTYPE bindings [
   <!ENTITY % accountsDTD SYSTEM "chrome://chat/locale/accounts.dtd">
-  <!ENTITY % certManagerDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
   %accountsDTD;
-  %certManagerDTD;
 ]>
 
 <bindings id="accountBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="account" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
@@ -32,18 +30,17 @@
             <xul:label class="connecting" crop="end" anonid="connecting" value="&account.connecting;"/>
             <xul:label class="connected" crop="end" anonid="connected"/>
             <xul:label class="disconnecting" crop="end" value="&account.disconnecting;"/>
             <xul:label class="disconnected" crop="end" value="&account.disconnected;"/>
             <xul:description class="error" anonid="error"/>
             <xul:description class="error" anonid="reconnect"/>
             <xul:label class="addException text-link"
                        onclick="gAccountManager.addException()"
-                       value="&certmgr.addException.label;"
-                       accesskey="&certmgr.addException.accesskey;"/>
+                       data-l10n-id="certmgr-add-exception"/>
             <xul:spacer flex="1"/>
           </xul:vbox>
           <xul:checkbox label="&account.autoSignOn.label;" dir="reverse"
                         xbl:inherits="checked=autologin" class="autoSignOn"
                         accesskey="&account.autoSignOn.accesskey;"
                         oncommand="gAccountManager.autologin()"/>
         </xul:hbox>
         <xul:hbox flex="1" class="account-buttons" anonid="buttons"
--- a/mail/components/im/content/imAccounts.xul
+++ b/mail/components/im/content/imAccounts.xul
@@ -24,16 +24,20 @@
         title="&accountsWindow.title;"
         style="&accountsWindow2.style;"
         persist="width height screenX screenY">
  <script type="application/javascript" src="chrome://messenger/content/chat/imAccounts.js"/>
  <script type="application/javascript" src="chrome://messenger/content/chat/imStatusSelector.js"/>
  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js" />
  <script type="application/javascript" src="chrome://global/content/nsTransferable.js" />
 
+ <linkset>
+   <link rel="localization" href="security/certificates/certManager.ftl"/>
+ </linkset>
+
  <stringbundle id="accountsBundle" src="chrome://messenger/locale/imAccounts.properties"/>
  <stringbundle id="chatBundle" src="chrome://messenger/locale/chat.properties"/>
 
  <commandset id="accountsCommands">
    <command id="cmd_connect"
             accesskey="&account.connect.accesskey;"
             label="&account.connect.label;"
             oncommand="gAccountManager.connect()"/>
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xul
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xul
@@ -12,18 +12,16 @@
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger-newsblog/skin/feed-subscriptions.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd">
     %feedDTD;
   <!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd">
     %newsblogDTD;
-  <!ENTITY % certDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
-    %certDTD;
 ]>
 
 <window id="subscriptionsDialog"
         flex="1"
         title="&feedSubscriptions.label;"
         windowtype="Mail:News-BlogSubscriptions"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
@@ -35,16 +33,20 @@
         onkeypress="FeedSubscriptions.onKeyPress(event);"
         onmousedown="FeedSubscriptions.onMouseDown(event);">
 
   <script type="application/javascript"
           src="chrome://messenger/content/specialTabs.js"/>
   <script type="application/javascript"
           src="chrome://messenger-newsblog/content/feed-subscriptions.js"/>
 
+  <linkset>
+    <link rel="localization" href="security/certificates/certManager.ftl"/>
+  </linkset>
+
   <keyset id="extensionsKeys">
     <key id="key_close"
          key="&cmd.close.commandKey;"
          modifiers="accel"
          oncommand="window.close();"/>
     <key id="key_close2"
          keycode="VK_ESCAPE"
          oncommand="window.close();"/>
@@ -230,18 +232,17 @@
       <label id="validationText"
              collapsed="true"
              class="text-link"
              crop="end"
              value="&validateText.label;"
              onclick="FeedSubscriptions.checkValidation(event);"/>
       <button id="addCertException"
               collapsed="true"
-              label="&certmgr.addException.label;"
-              accesskey="&certmgr.addException.accesskey;"
+              data-l10n-id="certmgr-add-exception"
               oncommand="FeedSubscriptions.addCertExceptionDialog();"/>
       <html:progress id="progressMeter"
                      hidden="hidden"
                      value="0"
                      max="100"/>
     </hbox>
 
     <hbox align="end">