Merge pull request #34377 from zbraniecki/1278358-update-formatoparts

Bug 1278358 - Update `dayperiod` to `dayPeriod` in DateTimeFormat formatToParts calls. r=stas
mozilla-b2g · Jun 8, 2016 · 15935d4 · 15935d4
2 parents cf4919c + 43e47bc
commit 15935d4
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 16 deletions.
diff --git a/apps/calendar/js/date_l10n.js b/apps/calendar/js/date_l10n.js
@@ -53,7 +53,7 @@ exports._localizeElement = function(element) {
   if (format === 'week-hour-format') {
     text = formatter.formatToParts(new Date(date)).map(({type, value}) => {
       switch(type) {
-        case 'dayperiod':
+        case 'dayPeriod':
           return `<span class="ampm" aria-hidden="true">${value}</span>`;
         default: return value;
       }

diff --git a/apps/calendar/js/templates/date_span.js b/apps/calendar/js/templates/date_span.js
@@ -29,9 +29,14 @@ module.exports = create({
     var formatter = IntlHelper.get(format);
 
     if (this.arg('addAmPmClass')) {
-      displayHour = formatter.format(date, {
-        dayperiod: '<span class="ampm" aria-hidden="true">$&</span>',
-      });
+      displayHour = formatter.formatToParts(date).map(({type, value}) => {
+        switch (type) {
+          case 'dayPeriod':
+            return `<span class="ampm" aria-hidden="true">${value}</span>`;
+          default:
+            return value;
+        }
+      }).reduce((string, part) => string + part, '');
     } else {
       displayHour = formatter.format(date);
     }

diff --git a/apps/calendar/js/views/current_time.js b/apps/calendar/js/views/current_time.js
@@ -112,7 +112,7 @@ CurrentTime.prototype = {
     this.element.textContent = formatter.formatToParts(now).map(
       ({type, value}) => {
         switch(type) {
-          case 'dayperiod': return '';
+          case 'dayPeriod': return '';
           default: return value;
         }
       }

diff --git a/apps/clock/js/utils.js b/apps/clock/js/utils.js
@@ -204,7 +204,7 @@ Utils.getLocalizedTimeHtml = function(date) {
   var f = IntlHelper.get('time-text');
   return f.formatToParts(date).map(({type, value}) => {
     switch(type) {
-      case 'dayperiod': return `<small>${value}</small>`;
+      case 'dayPeriod': return `<small>${value}</small>`;
       default: return value;
     }
   }).reduce((string, part) => string + part, '');

diff --git a/apps/communications/dialer/js/call_screen.js b/apps/communications/dialer/js/call_screen.js
@@ -396,7 +396,7 @@ var CallScreen = {
     if (formatter.resolvedOptions().hour12 === true) {
       timeText = formatter.formatToParts(now).map(({type, value}) => {
         switch (type) {
-          case 'dayperiod': return '';
+          case 'dayPeriod': return '';
           default: return value;
         }
       }).reduce((string, part) => string + part, '');

diff --git a/apps/communications/dialer/test/unit/call_screen_test.js b/apps/communications/dialer/test/unit/call_screen_test.js
@@ -903,7 +903,7 @@ suite('call screen', function() {
       window.navigator.mozHour12 = true;
 
       function stubFormatToParts(d) {
-        return [{type: 'dayperiod', value: 'AM'}];
+        return [{type: 'dayPeriod', value: 'AM'}];
       }
       if (!Intl.DateTimeFormat.prototype.formatToParts) {
         Intl.DateTimeFormat.prototype.formatToParts = stubFormatToParts;

diff --git a/apps/system/js/time_icon.js b/apps/system/js/time_icon.js
@@ -42,7 +42,7 @@
       var timeParts = this.timeFormatter.formatToParts(now);
       timeText = timeParts.map(({type, value}) => {
         switch (type) {
-          case 'dayperiod':
+          case 'dayPeriod':
             if (this.manager._ampm) {
               return `<span>${value}</span>`;
             }

diff --git a/apps/system/lockscreen/js/widgets/clock/lockscreen_clock_widget.js b/apps/system/lockscreen/js/widgets/clock/lockscreen_clock_widget.js
@@ -45,7 +45,7 @@
     var timeText =
       this.timeFormatter.formatToParts(now).map(({type, value}) => {
         switch (type) {
-          case 'dayperiod': return '';
+          case 'dayPeriod': return '';
           default: return value;
         }
       }

diff --git a/apps/system/test/unit/time_icon_test.js b/apps/system/test/unit/time_icon_test.js
@@ -33,7 +33,7 @@ suite('system/TimeIcon', function() {
     setup(function() {
       function stubFormatToParts(d) {
         return [
-          {type: 'dayperiod', value: 'AM'}
+          {type: 'dayPeriod', value: 'AM'}
         ];
       }
       if (!Intl.DateTimeFormat.prototype.formatToParts) {

diff --git a/tv_apps/smart-home/js/home.js b/tv_apps/smart-home/js/home.js
@@ -765,7 +765,7 @@
       var dayperiod = '';
 
       var timeWithoutDayPeriod = parts.map(({type, value}) => {
-        if (type === 'dayperiod') {
+        if (type === 'dayPeriod') {
           dayperiod = value;
           return '';
         }

diff --git a/tv_apps/smart-home/test/unit/home_test.js b/tv_apps/smart-home/test/unit/home_test.js
@@ -109,7 +109,7 @@ suite('home', function() {
         return [
           {type: 'hour', value: '12'},
           {type: 'minute', value: '25'},
-          {type: 'dayperiod', value: 'AM'}
+          {type: 'dayPeriod', value: 'AM'}
         ];
       };
     }

diff --git a/tv_apps/tv-epg/js/epg.js b/tv_apps/tv-epg/js/epg.js
@@ -271,12 +271,12 @@
 
     var parts = formatter.formatToParts(now);
 
-    var dayperiod = parts.find(part => part.type == 'dayperiod');
+    var dayperiod = parts.find(part => part.type == 'dayPeriod');
 
     var prefix = dayperiod ? dayperiod.value : '';
 
     var timeWithoutDayPeriod = parts.map(({type, value}) => {
-      return type === 'dayperiod' ? '' : value;
+      return type === 'dayPeriod' ? '' : value;
     }).join('');
 
     return {

diff --git a/tv_apps/tv-epg/test/unit/epg_test.js b/tv_apps/tv-epg/test/unit/epg_test.js
@@ -61,7 +61,7 @@ suite('tv-epg/epg', function() {
         return [
           {type: 'hour', value: '12'},
           {type: 'minute', value: '25'},
-          {type: 'dayperiod', value: 'AM'}
+          {type: 'dayPeriod', value: 'AM'}
         ];
       };
     }