Bug 796684 - Cleanup _updateHeader show year in months day view.

deanlandolt · Oct 4, 2012 · f9dae43 · f9dae43
1 parent 70d10f6
commit f9dae43
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/apps/calendar/js/views/months_day.js b/apps/calendar/js/views/months_day.js
@@ -36,18 +36,12 @@ Calendar.ns('Views').MonthsDay = (function() {
     },
 
     _updateHeader: function() {
-      var date = this.date;
-
-      var l10n = navigator.mozL10n;
-
-      var dayName = l10n.get('weekday-' + date.getDay() + '-long');
-      var monthName = l10n.get('month-' + date.getMonth() + '-long');
-
-      dayName = dayName || date.toLocaleFormat('%A');
-      monthName = monthName || date.toLocaleFormat('%B');
-
-      var header = dayName + ' ' + monthName + ' ' + date.getDate();
-      this.header.textContent = header;
+      // maybe we should localize this output ?
+      var format = this.app.dateFormat.localeFormat(
+        this.date,
+        '%A %B %Y'
+      );
+      this.header.textContent = format;
     },
 
     handleEvent: function(e) {

diff --git a/apps/calendar/test/unit/views/months_day_test.js b/apps/calendar/test/unit/views/months_day_test.js
@@ -93,12 +93,12 @@ suite('views/months_day', function() {
     subject.date = date;
     subject._updateHeader();
 
-    var month = date.toLocaleFormat('%B');
-    var day = date.toLocaleFormat('%A');
+    var expected = date.toLocaleFormat(
+      '%A %B %Y'
+    );
 
-    assert.include(el.innerHTML, '11');
-    assert.include(el.innerHTML, month);
-    assert.include(el.innerHTML, day);
+    assert.ok(el.innerHTML, 'has contents');
+    assert.include(el.innerHTML, expected);
   });
 
   test('#header', function() {