Fix bug 511518 - Calendar/Task Tab title needs dedicated string. r=markus

calendar/lightning/content/messenger-overlay-sidebar.js

@@ -91,7 +91,7 @@ var calendarTabType = {
       },
 
       restoreTab: function(aTabmail, aState) {
-        aState.title = document.getElementById('calendar-tab-button').getAttribute('tooltiptext');
+        aState.title = ltnGetString("lightning", "tabTitleCalendar");
         if ("selectedDay" in aState) {
             // Convert the serialized date to a datetime object
             aState.selectedDay = cal.createDateTime(aState.selectedDay);
@@ -100,9 +100,7 @@ var calendarTabType = {
       },
 
       onTitleChanged: function(aTab) {
-        // Make sure the title is updated.
-        // TODO We should move this to a dedicated string some time.
-        aTab.title = document.getElementById("calendar-tab-button").getAttribute("tooltiptext");
+        aTab.title = ltnGetString("lightning", "tabTitleCalendar");
       },
 
       supportsCommand: function (aCommand, aTab) calendarController.supportsCommand(aCommand),
@@ -142,10 +140,14 @@ var calendarTabType = {
       },
 
       restoreTab: function(aTabmail, aState) {
-        aState.title = document.getElementById('task-tab-button').getAttribute('tooltiptext');
+        aState.title = ltnGetString("lightning", "tabTitleTasks");
         aTabmail.openTab('tasks', aState);
       },
 
+      onTitleChanged: function(aTab) {
+        aTab.title = ltnGetString("lightning", "tabTitleTasks");
+      },
+
       supportsCommand: function (aCommand, aTab) calendarController.supportsCommand(aCommand),
       isCommandEnabled: function (aCommand, aTab) calendarController.isCommandEnabled(aCommand),
       doCommand: function(aCommand, aTab) calendarController.doCommand(aCommand),

calendar/locales/en-US/chrome/lightning/lightning.properties

@@ -48,6 +48,10 @@ brandShortName=Lightning
 # Task mode title
 taskModeApplicationTitle=Tasks
 
+# Tab titles
+tabTitleCalendar=Calendar
+tabTitleTasks=Tasks
+
 # Html event display in message
 imipHtml.header=Event Invitation
 imipHtml.summary=Title: