Skip to content

Commit 7447045

Browse files
committed
Merge pull request DefinitelyTyped#4275 from HarelM/master
Changed property of longDateFormat to function in Moment
2 parents 03826c8 + 821768c commit 7447045

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

moment/moment.d.ts

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -318,19 +318,27 @@ declare module moment {
318318

319319
}
320320

321-
interface MomentLanguage {
321+
interface BaseMomentLanguage {
322+
months ?: any;
323+
monthsShort ?: any;
324+
weekdays ?: any;
325+
weekdaysShort ?: any;
326+
weekdaysMin ?: any;
327+
relativeTime ?: MomentRelativeTime;
328+
meridiem ?: (hour: number, minute: number, isLowercase: boolean) => string;
329+
calendar ?: MomentCalendar;
330+
ordinal ?: (num: number) => string;
331+
}
322332

323-
months?: any;
324-
monthsShort?: any;
325-
weekdays?: any;
326-
weekdaysShort?: any;
327-
weekdaysMin?: any;
333+
interface MomentLanguage extends BaseMomentLanguage {
328334
longDateFormat?: MomentLongDateFormat;
329-
relativeTime?: MomentRelativeTime;
330-
meridiem?: (hour: number, minute: number, isLowercase: boolean) => string;
331-
calendar?: MomentCalendar;
332-
ordinal?: (num: number) => string;
335+
}
333336

337+
interface MomentLanguageData extends BaseMomentLanguage {
338+
/**
339+
* @param formatType should be L, LL, LLL, LLLL.
340+
*/
341+
longDateFormat(formatType: string): string;
334342
}
335343

336344
interface MomentLongDateFormat {
@@ -412,7 +420,7 @@ declare module moment {
412420
locale(language?: string[]): string;
413421
locale(language?: string, definition?: MomentLanguage): string;
414422

415-
localeData(language?: string): MomentLanguage;
423+
localeData(language?: string): MomentLanguageData;
416424

417425
longDateFormat: any;
418426
relativeTime: any;

0 commit comments

Comments
 (0)