Fix bug 394771 - Lightning calendar view context menus use wrong entities. r=ssitter

calendar/base/content/calendar-common-sets.xul

@@ -254,20 +254,27 @@
       <!-- These labels are set dynamically, based on the current view -->
       <menuitem id="calendar-view-context-menu-previous"
                 label=""
+                accesskey=""
                 observes="calendar_view_prev_command"
-                label-day="&calendar.prevday.button.tooltip;"
-                label-week="&calendar.prevweek.button.tooltip;"
-                label-multiweek="&calendar.prevweek.button.tooltip;"
-                label-month="&calendar.prevmonth.button.tooltip;"
-                accesskey="&goPreviousCmd.accesskey;"/>
+                label-day="&calendar.prevday.label;"
+                label-week="&calendar.prevweek.label;"
+                label-multiweek="&calendar.prevweek.label;"
+                label-month="&calendar.prevmonth.label;"
+                accesskey-day="&calendar.prevday.accesskey;"
+                accesskey-week="&calendar.prevweek.accesskey;"
+                accesskey-multiweek="&calendar.prevweek.accesskey;"
+                accesskey-month="&calendar.prevmonth.accesskey;"/>
       <menuitem id="calendar-view-context-menu-next"
                 label=""
                 observes="calendar_view_next_command"
-                label-day="&calendar.nextday.button.tooltip;"
-                label-week="&calendar.nextweek.button.tooltip;"
-                label-multiweek="&calendar.nextweek.button.tooltip;"
-                label-month="&calendar.nextmonth.button.tooltip;"
-                accesskey="&goNextCmd.all.accesskey;"/>
+                label-day="&calendar.nextday.label;"
+                label-week="&calendar.nextweek.label;"
+                label-multiweek="&calendar.nextweek.label;"
+                label-month="&calendar.nextmonth.label;"
+                accesskey-day="&calendar.nextday.accesskey;"
+                accesskey-week="&calendar.nextweek.accesskey;"
+                accesskey-multiweek="&calendar.nextweek.accesskey;"
+                accesskey-month="&calendar.nextmonth.accesskey;"/>
       <menuseparator id="calendar-item-context-separator-cutcopypaste"/>
       <!-- Cut and copy doesn't make sense in the views, but only showing paste
            makes it look like something is missing. Disable by default. -->

calendar/base/content/calendar-views.js

@@ -344,14 +344,14 @@ function switchToView(aViewType) {
         }
     }
 
-    // Set up the labels for the context menu
+    // Set up the labels and accesskeys for the context menu
     ["calendar-view-context-menu-next",
      "calendar-view-context-menu-previous",
      "calendar-go-menu-next",
-     "calendar-go-menu-previous"].forEach(function(x) setupViewNode(x, "label"));
-
-    ["calendar-go-menu-next",
-     "calendar-go-menu-previous"].forEach(function(x) setupViewNode(x, "accesskey"));
+     "calendar-go-menu-previous"].forEach(function(x) {
+            setupViewNode(x, "label");
+            setupViewNode(x, "accesskey")
+     });
 
     // Set up the labels for the view navigation
     ["previous-view-button",

calendar/locales/en-US/chrome/calendar/calendar.dtd

@@ -88,12 +88,18 @@
 <!ENTITY calendar.month.button.tooltip          "Switch to month view" >
 <!ENTITY calendar.multiweek.button.tooltip      "Switch to multiweek view" >
 
-<!ENTITY calendar.nextday.button.tooltip        "Next Day" >
-<!ENTITY calendar.prevday.button.tooltip        "Previous Day" >
-<!ENTITY calendar.nextweek.button.tooltip       "Next Week" >
-<!ENTITY calendar.prevweek.button.tooltip       "Previous Week" >
-<!ENTITY calendar.nextmonth.button.tooltip      "Next Month" >
-<!ENTITY calendar.prevmonth.button.tooltip      "Previous Month" >
+<!ENTITY calendar.nextday.label                 "Next Day" >
+<!ENTITY calendar.prevday.label                 "Previous Day" >
+<!ENTITY calendar.nextday.accesskey             "x" >
+<!ENTITY calendar.prevday.accesskey             "s" >
+<!ENTITY calendar.nextweek.label                "Next Week" >
+<!ENTITY calendar.prevweek.label                "Previous Week" >
+<!ENTITY calendar.nextweek.accesskey            "x" >
+<!ENTITY calendar.prevweek.accesskey            "s" >
+<!ENTITY calendar.nextmonth.label               "Next Month" >
+<!ENTITY calendar.prevmonth.label               "Previous Month" >
+<!ENTITY calendar.nextmonth.accesskey           "x" >
+<!ENTITY calendar.prevmonth.accesskey           "s" >
 
 <!ENTITY calendar.navigation.nextday.tooltip    "One Day Forward" >
 <!ENTITY calendar.navigation.prevday.tooltip    "One Day Back" >

calendar/locales/en-US/chrome/calendar/menuOverlay.dtd

@@ -92,16 +92,6 @@
 <!ENTITY goTodayCmd.label                       "Today">
 <!ENTITY goTodayCmd.accesskey                   "T">
 
-<!ENTITY goPreviousCmd.day.label                "Previous Day">
-<!ENTITY goPreviousCmd.week.label               "Previous Week">
-<!ENTITY goPreviousCmd.month.label              "Previous Month">
-<!ENTITY goPreviousCmd.accesskey                "P">
-
-<!ENTITY goNextCmd.day.label                    "Next Day">
-<!ENTITY goNextCmd.week.label                   "Next Week">
-<!ENTITY goNextCmd.month.label                  "Next Month">
-<!ENTITY goNextCmd.all.accesskey                "e">
-
 <!ENTITY showCurrentView.label                  "Current View">
 <!ENTITY showCurrentView.accesskey              "V">
 

calendar/sunbird/base/content/calendar-menubar.inc

@@ -355,19 +355,27 @@
                 attribute with the correct label -->
            <menuitem id="calendar-go-menu-previous"
                      label=""
-                     label-day="&goPreviousCmd.day.label;"
-                     label-week="&goPreviousCmd.week.label;"
-                     label-multiweek="&goPreviousCmd.week.label;"
-                     label-month="&goPreviousCmd.month.label;"
-                     accesskey="&goPreviousCmd.accesskey;"
+                     accesskey=""
+                     label-day="&calendar.prevday.label;"
+                     label-week="&calendar.prevweek.label;"
+                     label-multiweek="&calendar.prevweek.label;"
+                     label-month="&calendar.prevmonth.label;"
+                     accesskey-day="&calendar.prevday.accesskey;"
+                     accesskey-week="&calendar.prevweek.accesskey;"
+                     accesskey-multiweek="&calendar.prevweek.accesskey;"
+                     accesskey-month="&calendar.prevmonth.accesskey;"
                      observes="calendar_view_prev_command"/>
            <menuitem id="calendar-go-menu-next"
                      label=""
-                     label-day="&goNextCmd.day.label;"
-                     label-week="&goNextCmd.week.label;"
-                     label-multiweek="&goNextCmd.week.label;"
-                     label-month="&goNextCmd.month.label;"
-                     accesskey="&goNextCmd.all.accesskey;"
+                     accesskey=""
+                     label-day="&calendar.nextday.label;"
+                     label-week="&calendar.nextweek.label;"
+                     label-multiweek="&calendar.nextweek.label;"
+                     label-month="&calendar.nextmonth.label;"
+                     accesskey-day="&calendar.nextday.accesskey;"
+                     accesskey-week="&calendar.nextweek.accesskey;"
+                     accesskey-multiweek="&calendar.nextweek.accesskey;"
+                     accesskey-month="&calendar.nextmonth.accesskey;"
                      observes="calendar_view_next_command"/>
          </menupopup>
        </menu>