@@ -74,7 +74,7 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
7474 }
7575 </ style >
7676
77- < div part ="month-header " id ="month-header " aria-hidden ="true "> [[_getTitle(month, i18n.monthNames )]]</ div >
77+ < div part ="month-header " id ="month-header " aria-hidden ="true "> [[_getTitle(month, i18n)]]</ div >
7878 < table
7979 id ="monthGrid "
8080 role ="grid "
@@ -84,15 +84,8 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
8484 >
8585 < thead id ="weekdays-container ">
8686 < tr role ="row " part ="weekdays ">
87- < th
88- part ="weekday "
89- aria-hidden ="true "
90- hidden$ ="[[!_showWeekSeparator(showWeekNumbers, i18n.firstDayOfWeek)]] "
91- > </ th >
92- < template
93- is ="dom-repeat "
94- items ="[[_getWeekDayNames(i18n.weekdays, i18n.weekdaysShort, showWeekNumbers, i18n.firstDayOfWeek)]] "
95- >
87+ < th part ="weekday " aria-hidden ="true " hidden$ ="[[!_showWeekSeparator(showWeekNumbers, i18n)]] "> </ th >
88+ < template is ="dom-repeat " items ="[[_getWeekDayNames(i18n, showWeekNumbers)]] ">
9689 < th role ="columnheader " part ="weekday " scope ="col " abbr$ ="[[item.weekDay]] " aria-hidden ="true ">
9790 [[item.weekDayShort]]
9891 </ th >
@@ -102,11 +95,7 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
10295 < tbody id ="days-container ">
10396 < template is ="dom-repeat " items ="[[_weeks]] " as ="week ">
10497 < tr role ="row ">
105- < td
106- part ="week-number "
107- aria-hidden ="true "
108- hidden$ ="[[!_showWeekSeparator(showWeekNumbers, i18n.firstDayOfWeek)]] "
109- >
98+ < td part ="week-number " aria-hidden ="true " hidden$ ="[[!_showWeekSeparator(showWeekNumbers, i18n)]] ">
11099 [[__getWeekNumber(week)]]
111100 </ td >
112101 < template is ="dom-repeat " items ="[[week]] ">
@@ -191,7 +180,7 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
191180
192181 _days : {
193182 type : Array ,
194- computed : '_getDays(month, i18n.firstDayOfWeek , minDate, maxDate)' ,
183+ computed : '_getDays(month, i18n, minDate, maxDate)' ,
195184 } ,
196185
197186 _weeks : {
@@ -208,10 +197,7 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
208197 }
209198
210199 static get observers ( ) {
211- return [
212- '_showWeekNumbersChanged(showWeekNumbers, i18n.firstDayOfWeek)' ,
213- '__focusedDateChanged(focusedDate, _days)' ,
214- ] ;
200+ return [ '_showWeekNumbersChanged(showWeekNumbers, i18n)' , '__focusedDateChanged(focusedDate, _days)' ] ;
215201 }
216202
217203 get focusableDateElement ( ) {
@@ -253,11 +239,11 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
253239 return ! dateAllowed ( firstDate , minDate , maxDate ) && ! dateAllowed ( lastDate , minDate , maxDate ) ;
254240 }
255241
256- _getTitle ( month , monthNames ) {
257- if ( month === undefined || monthNames === undefined ) {
242+ _getTitle ( month , i18n ) {
243+ if ( month === undefined || i18n === undefined ) {
258244 return ;
259245 }
260- return this . i18n . formatTitle ( monthNames [ month . getMonth ( ) ] , month . getFullYear ( ) ) ;
246+ return i18n . formatTitle ( i18n . monthNames [ month . getMonth ( ) ] , month . getFullYear ( ) ) ;
261247 }
262248
263249 _onMonthGridTouchStart ( ) {
@@ -279,25 +265,21 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
279265 return weekDayNames . slice ( firstDayOfWeek ) . concat ( weekDayNames . slice ( 0 , firstDayOfWeek ) ) ;
280266 }
281267
282- _getWeekDayNames ( weekDayNames , weekDayNamesShort , showWeekNumbers , firstDayOfWeek ) {
283- if (
284- weekDayNames === undefined ||
285- weekDayNamesShort === undefined ||
286- showWeekNumbers === undefined ||
287- firstDayOfWeek === undefined
288- ) {
289- return ;
268+ _getWeekDayNames ( i18n , showWeekNumbers ) {
269+ if ( i18n === undefined || showWeekNumbers === undefined ) {
270+ return [ ] ;
290271 }
291- weekDayNames = this . _applyFirstDayOfWeek ( weekDayNames , firstDayOfWeek ) ;
292- weekDayNamesShort = this . _applyFirstDayOfWeek ( weekDayNamesShort , firstDayOfWeek ) ;
293- weekDayNames = weekDayNames . map ( ( day , index ) => {
272+ const { weekdays, weekdaysShort, firstDayOfWeek } = i18n ;
273+
274+ const weekDayNamesShort = this . _applyFirstDayOfWeek ( weekdaysShort , firstDayOfWeek ) ;
275+ const weekDayNames = this . _applyFirstDayOfWeek ( weekdays , firstDayOfWeek ) ;
276+
277+ return weekDayNames . map ( ( day , index ) => {
294278 return {
295279 weekDay : day ,
296280 weekDayShort : weekDayNamesShort [ index ] ,
297281 } ;
298282 } ) ;
299-
300- return weekDayNames ;
301283 }
302284
303285 __focusedDateChanged ( focusedDate , days ) {
@@ -312,25 +294,25 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
312294 return date ? date . getDate ( ) : '' ;
313295 }
314296
315- _showWeekNumbersChanged ( showWeekNumbers , firstDayOfWeek ) {
316- if ( showWeekNumbers && firstDayOfWeek === 1 ) {
297+ _showWeekNumbersChanged ( showWeekNumbers , i18n ) {
298+ if ( showWeekNumbers && i18n && i18n . firstDayOfWeek === 1 ) {
317299 this . setAttribute ( 'week-numbers' , '' ) ;
318300 } else {
319301 this . removeAttribute ( 'week-numbers' ) ;
320302 }
321303 }
322304
323- _showWeekSeparator ( showWeekNumbers , firstDayOfWeek ) {
305+ _showWeekSeparator ( showWeekNumbers , i18n ) {
324306 // Currently only supported for locales that start the week on Monday.
325- return showWeekNumbers && firstDayOfWeek === 1 ;
307+ return showWeekNumbers && i18n && i18n . firstDayOfWeek === 1 ;
326308 }
327309
328310 _isToday ( date ) {
329311 return dateEquals ( new Date ( ) , date ) ;
330312 }
331313
332- _getDays ( month , firstDayOfWeek ) {
333- if ( month === undefined || firstDayOfWeek === undefined ) {
314+ _getDays ( month , i18n ) {
315+ if ( month === undefined || i18n === undefined ) {
334316 return ;
335317 }
336318 // First day of the month (at midnight).
@@ -340,7 +322,7 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
340322 date . setDate ( 1 ) ;
341323
342324 // Rewind to first day of the week.
343- while ( date . getDay ( ) !== firstDayOfWeek ) {
325+ while ( date . getDay ( ) !== i18n . firstDayOfWeek ) {
344326 this . _dateAdd ( date , - 1 ) ;
345327 }
346328
0 commit comments