Bug 1489825 - Move string for calendar preferences label to mail's preferences.dtd; r=aceman, Fallen
authorGeoff Lankow <geoff@darktrojan.net>
Mon, 15 Oct 2018 20:25:03 +1300
changeset 33371 aaeeda026e117a1ab009699dbfba52ba4ea9c52a
parent 33370 c12b2ee90c46b9ec5ee6807f81221e60009bb272
child 33372 ab7eef3d430ed61fb8ee43ebdeb831e63dc49576
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersaceman, Fallen
bugs1489825
Bug 1489825 - Move string for calendar preferences label to mail's preferences.dtd; r=aceman, Fallen
calendar/lightning/content/messenger-overlay-preferences.js
mail/components/preferences/aboutPreferences.xul
mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
--- a/calendar/lightning/content/messenger-overlay-preferences.js
+++ b/calendar/lightning/content/messenger-overlay-preferences.js
@@ -11,19 +11,16 @@ var gLightningPane = {
         let preference = document.getElementById("calendar.preferences.lightning.selectedTabIndex");
         let ltnPrefs = document.getElementById("calPreferencesTabbox");
         if (preference.value) {
             ltnPrefs.selectedIndex = preference.value;
         }
         ltnPrefs.addEventListener("select", gLightningPane.tabSelectionChanged.bind(this));
         this.mInitialized = true;
 
-        let categoryButton = document.querySelector('#category-box radio[pane="paneLightning"]');
-        categoryButton.label = document.getElementById("paneLightning").label;
-
         let elements = document.querySelectorAll("#paneLightning preference");
         for (let element of elements) {
             element.updateElements();
         }
     },
 
     tabSelectionChanged: function() {
         if (!this.mInitialized) {
--- a/mail/components/preferences/aboutPreferences.xul
+++ b/mail/components/preferences/aboutPreferences.xul
@@ -48,11 +48,11 @@
 
 #include general.inc.xul
 #include display.inc.xul
 #include compose.inc.xul
 #include chat.inc.xul
 #include privacy.inc.xul
 #include security.inc.xul
 #include applications.inc.xul
-  <prefpane id="paneLightning"/>
+  <prefpane id="paneLightning" label="&paneLightning.title;"/>
 #include advanced.inc.xul
 </preftab>
--- a/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
+++ b/mail/locales/en-US/chrome/messenger/preferences/preferences.dtd
@@ -14,13 +14,14 @@
 
 <!ENTITY paneGeneral.title        "General">
 <!ENTITY paneDisplay.title        "Display">
 <!ENTITY paneComposition.title    "Composition">
 <!ENTITY paneChat.title           "Chat">
 <!ENTITY paneAttachments.title    "Attachments">
 <!ENTITY panePrivacy.title        "Privacy">
 <!ENTITY paneSecurity.title       "Security">
+<!ENTITY paneLightning.title      "Calendar">
 <!ENTITY paneAdvanced.title       "Advanced">
 <!ENTITY paneAccount.title        "Accounts">
 
 <!ENTITY okButton.title           "OK">
 <!ENTITY okButton.accesskey       "O">