Commit 524dea7

committed

fix: using locales from dayjs

1 parent 9ec913d commit 524dea7Copy full SHA for 524dea7

File tree

1 file changed

-19

lines changed

projects/angular-datetimerangepicker/src/calendar
- calendar-component.ts

1 file changed

-19

lines changed

`‎projects/angular-datetimerangepicker/src/calendar/calendar-component.ts‎`

Lines changed: 9 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import dayjs, { Dayjs } from 'dayjs';`
`10`	`10`	`import customParser from 'dayjs/plugin/customParseFormat';`
`11`	`11`	`import isSameOrAfter from 'dayjs/plugin/isSameOrAfter';`
`12`	`12`	`import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';`
	`13`	`+import localeData from 'dayjs/plugin/localeData';`
`13`	`14`	`import {`
`14`	`15`	`DateChanged,`
`15`	`16`	`MonthNameValue,`
`@@ -20,7 +21,7 @@ import {`
`20`	`21`	`dayjs.extend(isSameOrAfter);`
`21`	`22`	`dayjs.extend(isSameOrBefore);`
`22`	`23`	`dayjs.extend(customParser);`
`23`		`-`
	`24`	`+dayjs.extend(localeData);`
`24`	`25`	`@Component({`
`25`	`26`	`selector: 'calendar',`
`26`	`27`	`templateUrl: './calendar-component.html',`
`@@ -138,20 +139,7 @@ export class Calendar implements OnChanges {`
`138`	`139`	`});`
`139`	`140`	`}`
`140`	`141`	`createTouchCalendarGridData(): void {`
`141`		`- const monthsList = [`
`142`		`- 'January',`
`143`		`- 'February',`
`144`		`- 'March',`
`145`		`- 'April',`
`146`		`- 'May',`
`147`		`- 'June',`
`148`		`- 'July',`
`149`		`- 'August',`
`150`		`- 'September',`
`151`		`- 'October',`
`152`		`- 'November',`
`153`		`- 'December',`
`154`		`- ];`
	`142`	`+ const monthsList = dayjs.months();`
`155`	`143`	`this.yearsList = [];`
`156`	`144`	`this.monthsList = [];`
`157`	`145`	`for (let i = 1900; i <= +dayjs().add(100, 'year').get('year'); i++) {`
`@@ -220,9 +208,9 @@ export class Calendar implements OnChanges {`
`220`	`208`	`}`
`221`	`209`	`// if this months last week has less than 7 days then take next month's first week and merge them`
`222`	`210`	`if (thisMonthWeekList.slice(-1)[0].length < 7) {`
`223`		`- thisMonthWeekList[`
`224`		`- thisMonthWeekList.length-1`
`225`		`- ]=thisMonthWeekList.slice(-1)[0].concat(this.getNextMonthFirstWeek());`
	`211`	`+ thisMonthWeekList[thisMonthWeekList.length-1]=thisMonthWeekList`
	`212`	`+ .slice(-1)[0]`
	`213`	`+ .concat(this.getNextMonthFirstWeek());`
`226`	`214`	`}`
`227`	`215`	`// if total number of weeks is less than 6 then we need to add one more week`
`228`	`216`	`// Here we add previous months second last week`
`@@ -238,7 +226,9 @@ export class Calendar implements OnChanges {`
`238`	`226`	`this.weekEndOn = [this.weekStartsOn, this.weekStartsOn + 6];`
`239`	`227`	`}`
`240`	`228`	`setWeekDays() {`
`241`		`- let weekDays = ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'];`
	`229`	`+ let weekDays: string[] = dayjs`
	`230`	`+ .weekdaysShort()`
	`231`	`+ .map((x) => x.replace(/[a-zA-Z]{1}$/, ''));`
`242`	`232`	`weekDays = [`
`243`	`233`	`...weekDays.slice(this.weekStartsOn, 7),`
`244`	`234`	`...weekDays.slice(0, this.weekStartsOn),`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 524dea7

File tree

1 file changed

1 file changed

`‎projects/angular-datetimerangepicker/src/calendar/calendar-component.ts‎`

0 commit comments