Bug 1516617 - Port bug 1507595: Convert our own about:support strings to Fluent. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Fri, 28 Dec 2018 08:49:09 +0100
changeset 34076 af79aa826c3a692a097ea5b6182e0e7138bf730f
parent 34075 e1df268e0c14fe650a8c9b5a130ab77413e6e060
child 34077 dde486474a5eb462e8a3c7e935af15edd1e4c9ee
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersjorgk
bugs1516617, 1507595
Bug 1516617 - Port bug 1507595: Convert our own about:support strings to Fluent. r=jorgk
mail/components/about-support/content/aboutSupport.xhtml
mail/locales/en-US/chrome/messenger/aboutSupportMail.dtd
mail/locales/en-US/messenger/aboutSupportMail.ftl
mail/locales/jar.mn
--- a/mail/components/about-support/content/aboutSupport.xhtml
+++ b/mail/components/about-support/content/aboutSupport.xhtml
@@ -5,18 +5,16 @@
 
 <!-- This file is a copy of mozilla/toolkit/content/aboutSupport.xhtml with
      modifications for TB. -->
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
   <!ENTITY % resetProfileDTD SYSTEM "chrome://global/locale/resetProfile.dtd"> %resetProfileDTD;
-<!-- Added for TB -->
-  <!ENTITY % aboutSupportMailDTD SYSTEM "chrome://messenger/locale/aboutSupportMail.dtd"> %aboutSupportMailDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title data-l10n-id="page-title"/>
 
     <link rel="icon" type="image/png" id="favicon"
           href="chrome://branding/content/icon48.png"/>
@@ -29,16 +27,17 @@
     <link rel="stylesheet" href="chrome://messenger/content/about-support/hide-private.css"
           type="text/css" id="about-support-private"/>
 <!-- End of TB addition -->
     <script type="application/javascript"
             src="chrome://messenger/content/about-support/aboutSupport.js"/>
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="toolkit/about/aboutSupport.ftl"/>
 <!-- Added for TB -->
+    <link rel="localization" href="messenger/aboutSupportMail.ftl"/>
     <script type="application/javascript"
             src="chrome://messenger/content/about-support/accounts.js"/>
     <script type="application/javascript"
             src="chrome://messenger/content/about-support/export.js"/>
 <!-- End of TB addition -->
   </head>
 
   <body class="wide-container">
@@ -65,23 +64,24 @@
     </div>
 
     <div>
 <!-- Not used on TB
       <button id="copy-raw-data-to-clipboard" data-l10n-id="copy-raw-data-to-clipboard-label"/>
  -->
       <button id="copy-to-clipboard" data-l10n-id="copy-text-to-clipboard-label"/>
 <!-- Added for TB -->
-      <button id="send-via-email">
-        &aboutSupport.sendViaEmail.label;
-      </button>
-      <input type="checkbox" id="check-show-private-data" class="data-uionly"
-             onchange="onShowPrivateDataChange(this);" />
-      <label for="check-show-private-data">&aboutSupport.showPrivateData.mainText;
-      <span class="gray-text">&aboutSupport.showPrivateData.explanationText;</span></label>
+      <button id="send-via-email" data-l10n-id="send-via-email"/>
+      <input type="checkbox"
+             id="check-show-private-data"
+             class="data-uionly"
+             role="checkbox"
+             onchange="onShowPrivateDataChange(this);"/>
+      <label for="check-show-private-data" data-l10n-id="show-private-data-main-text"/>
+      <label class="gray-text" data-l10n-id="show-private-data-explanation-text"/>
 <!-- End of TB addition -->
     </div>
 
     <div id="contents">
 
       <!-- - - - - - - - - - - - - - - - - - - - - -->
 
       <h2 class="major-section" data-l10n-id="app-basics-title"/>
@@ -236,73 +236,47 @@
           </tr>
 #endif
 
         </tbody>
       </table>
 
       <!-- - - - - - - - - - - - - - - - - - - - - -->
 <!-- Added for TB -->
-      <h2 class="major-section">
-        &aboutSupport.accountsTitle;
-      </h2>
+      <h2 class="major-section" data-l10n-id="accounts-title"/>
 
       <table id="accounts-table">
         <thead>
           <tr>
-            <th rowspan="2">
-              &aboutSupport.accountsID;
-            </th>
+            <th rowspan="2" data-l10n-id="accounts-ID"/>
 
-            <th rowspan="2" class="data-private">
-              &aboutSupport.accountsName;
-            </th>
+            <th rowspan="2" class="data-private" data-l10n-id="accounts-name"/>
 
-            <th colspan="3">
-              &aboutSupport.accountsIncomingServer;
-            </th>
+            <th colspan="3" data-l10n-id="accounts-incoming-server"/>
 
-            <th colspan="5">
-              &aboutSupport.accountsOutgoingServers;
-            </th>
+            <th colspan="5" data-l10n-id="accounts-outgoing-servers"/>
           </tr>
           <tr class="thead-level2">
             <!-- Incoming server -->
-            <th>
-              &aboutSupport.accountsServerName;
-            </th>
+            <th data-l10n-id="accounts-server-name"/>
 
-            <th>
-              &aboutSupport.accountsConnSecurity;
-            </th>
+            <th data-l10n-id="accounts-conn-security"/>
 
-            <th>
-              &aboutSupport.accountsAuthMethod;
-            </th>
+            <th data-l10n-id="accounts-auth-method"/>
 
             <!-- Outgoing servers -->
-            <th class="data-private">
-              &aboutSupport.identityName;
-            </th>
+            <th class="data-private" data-l10n-id="identity-name"/>
 
-            <th>
-              &aboutSupport.accountsServerName;
-            </th>
+            <th data-l10n-id="accounts-server-name"/>
 
-            <th>
-              &aboutSupport.accountsConnSecurity;
-            </th>
+            <th data-l10n-id="accounts-conn-security"/>
 
-            <th>
-              &aboutSupport.accountsAuthMethod;
-            </th>
+            <th data-l10n-id="accounts-auth-method"/>
 
-            <th>
-              &aboutSupport.accountsDefault;
-            </th>
+            <th data-l10n-id="accounts-default"/>
           </tr>
         </thead>
 
         <tbody id="accounts-tbody">
         </tbody>
       </table>
 <!-- End of TB addition -->
 
rename from mail/locales/en-US/chrome/messenger/aboutSupportMail.dtd
rename to mail/locales/en-US/messenger/aboutSupportMail.ftl
--- a/mail/locales/en-US/chrome/messenger/aboutSupportMail.dtd
+++ b/mail/locales/en-US/messenger/aboutSupportMail.ftl
@@ -1,20 +1,18 @@
-<!-- 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/. -->
-
-<!ENTITY aboutSupport.appBasicsAppBuildID "Application Build ID">
+# 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/.
 
-<!ENTITY aboutSupport.accountsTitle "Mail and News Accounts">
-<!ENTITY aboutSupport.showPrivateData.mainText "Include account names">
-<!ENTITY aboutSupport.showPrivateData.explanationText "(possibly identifying information)">
-<!ENTITY aboutSupport.accountsID "ID">
-<!ENTITY aboutSupport.accountsName "Name">
-<!ENTITY aboutSupport.accountsIncomingServer "Incoming server">
-<!ENTITY aboutSupport.accountsOutgoingServers "Outgoing servers">
-<!ENTITY aboutSupport.accountsServerName "Name">
-<!ENTITY aboutSupport.accountsConnSecurity "Connection security">
-<!ENTITY aboutSupport.accountsAuthMethod "Authentication method">
-<!ENTITY aboutSupport.accountsDefault "Default?">
-<!ENTITY aboutSupport.identityName "Identity">
+accounts-title = Mail and News Accounts
+show-private-data-main-text = Include account names
+show-private-data-explanation-text = (possibly identifying information)
+accounts-ID = ID
+accounts-name = Name
+accounts-incoming-server = Incoming server
+accounts-outgoing-servers = Outgoing servers
+accounts-server-name = Name
+accounts-conn-security = Connection security
+accounts-auth-method = Authentication method
+accounts-default = Default?
+identity-name = Identity
 
-<!ENTITY aboutSupport.sendViaEmail.label "Send via email">
+send-via-email = Send via email
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -13,17 +13,16 @@
 
 
 @AB_CD@.jar:
 % locale messenger @AB_CD@ %locale/@AB_CD@/messenger/
   locale/@AB_CD@/messenger/aboutDialog.dtd                              (%chrome/messenger/aboutDialog.dtd)
   locale/@AB_CD@/messenger/aboutDownloads.dtd                           (%chrome/messenger/aboutDownloads.dtd)
   locale/@AB_CD@/messenger/aboutRights.dtd                              (%chrome/messenger/aboutRights.dtd)
   locale/@AB_CD@/messenger/aboutRights.properties                       (%chrome/messenger/aboutRights.properties)
-  locale/@AB_CD@/messenger/aboutSupportMail.dtd                         (%chrome/messenger/aboutSupportMail.dtd)
   locale/@AB_CD@/messenger/aboutSupportMail.properties                  (%chrome/messenger/aboutSupportMail.properties)
   locale/@AB_CD@/messenger/telemetry.properties                         (%chrome/messenger/telemetry.properties)
   locale/@AB_CD@/messenger/accountCreation.dtd                          (%chrome/messenger/accountCreation.dtd)
   locale/@AB_CD@/messenger/accountCreation.properties                   (%chrome/messenger/accountCreation.properties)
   locale/@AB_CD@/messenger/accountCreationModel.properties              (%chrome/messenger/accountCreationModel.properties)
   locale/@AB_CD@/messenger/accountCreationUtil.properties               (%chrome/messenger/accountCreationUtil.properties)
   locale/@AB_CD@/messenger/addons.properties                            (%chrome/messenger/addons.properties)
   locale/@AB_CD@/messenger/charsetTitles.properties                     (%chrome/messenger/charsetTitles.properties)