From b370cad252e79d8673907e136917680b2c2cd77a Mon Sep 17 00:00:00 2001 From: JabX Date: Fri, 21 Sep 2018 00:25:34 +0200 Subject: [PATCH 1/2] Utilise moment.localeData() dans l'input date --- src/components/input-date.tsx | 8 +++++++- src/components/types.d.ts | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/input-date.tsx b/src/components/input-date.tsx index 5cab907be..b8e6c67c5 100644 --- a/src/components/input-date.tsx +++ b/src/components/input-date.tsx @@ -260,7 +260,13 @@ export class InputDate extends React.Component { handleSelect={() => null} selectedDate={this.jsDate} display={this.calendarDisplay} - locale={moment.locale()} + locale={{ + months: moment.localeData().months(), + monthsShort: moment.localeData().monthsShort(), + weekdays: moment.localeData().weekdays(), + weekdaysLetter: moment.localeData().weekdaysMin(), + weekdaysShort: moment.localeData().weekdaysShort() + }} onChange={this.onCalendarChange} theme={theme} /> diff --git a/src/components/types.d.ts b/src/components/types.d.ts index 872fe42a6..f04fd42fd 100644 --- a/src/components/types.d.ts +++ b/src/components/types.d.ts @@ -6,13 +6,14 @@ declare module "react-toolbox/lib/date_picker/theme.css"; declare module "react-toolbox/lib/time_picker/theme.css"; declare module "react-toolbox/lib/date_picker/Calendar" { + import {DatePickerLocale} from "react-toolbox/lib/date_picker"; interface CalendarProps { disabledDates?: Date[]; display?: "months" | "years"; enabledDates?: Date[]; - handleSelect?: Function - locale?: string | {}; + handleSelect?: Function; + locale?: string | DatePickerLocale; maxDate?: Date; minDate?: Date; onChange: Function; From 4837145c9be4b9087187d9527d3b1b2d78351f34 Mon Sep 17 00:00:00 2001 From: JabX Date: Fri, 21 Sep 2018 00:26:34 +0200 Subject: [PATCH 2/2] 8.7.10 (fix #78) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index beaba3c7b..f9fd24581 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "focus4", - "version": "8.7.9", + "version": "8.7.10", "description": "Focus v4 (Typescript + MobX)", "main": "index.js", "repository": {