Skip to content

Commit 29565d3

Browse files
committed
Fixed issue with "next ..." in Italian dates (#591)
1 parent d920840 commit 29565d3

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

Diff for: lib/locales/it.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ Sugar.Date.addLocale('it', {
4141
'{0?} {shift} {unit:5-7}'
4242
],
4343
'timeParse': [
44-
'{shift?} {day|weekday}',
44+
'{day|weekday} {shift?}',
4545
'{weekday?},? {date} {months?}\\.? {year?}'
4646
],
4747
'timeFrontParse': [
48-
'{shift?} {day|weekday}',
48+
'{day|weekday} {shift?}',
4949
'{weekday?},? {date} {months?}\\.? {year?}'
5050
]
5151
});

Diff for: test/tests/locales/it.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@ namespace('Date | Italian', function () {
5959
assertDateParsed("l'anno scorso", getRelativeDate(-1));
6060
assertDateParsed("l'anno prossimo", getRelativeDate(1));
6161

62-
assertDateParsed('prossimo lunedì', testGetWeekday(1, 1));
63-
assertDateParsed('scorsa lunedì', testGetWeekday(1, -1));
62+
assertDateParsed('lunedì prossimo', testGetWeekday(1, 1));
63+
assertDateParsed('lunedì scorsa', testGetWeekday(1, -1));
6464

65-
assertDateParsed('scorsa lunedì 3:45', testGetWeekday(1, -1, 3, 45));
65+
assertDateNotParsed('prossimo lunedì');
66+
assertDateNotParsed('scorsa lunedì');
67+
68+
assertDateParsed('lunedì scorsa 3:45', testGetWeekday(1, -1, 3, 45));
6669

6770
// No accents
6871
assertDateParsed('Giovedì, 5 Gennaio 2012', new Date(2012, 0, 5));
@@ -82,7 +85,7 @@ namespace('Date | Italian', function () {
8285
equal(run(testCreateDate('2012/08/25', 'ux_UX'), 'isValid'), true, 'System intelligible formats are still parsed');
8386

8487
assertDateParsed('17:32 18 agosto', new Date(now.getFullYear(), 7, 18, 17, 32));
85-
assertDateParsed('17:32 prossimo lunedì', testGetWeekday(1, 1, 17, 32));
88+
assertDateParsed('17:32 lunedì prossimo', testGetWeekday(1, 1, 17, 32));
8689

8790
assertDateParsed('domani alle 3:30', testDateSet(getRelativeDateReset(0,0,1), {hour:3,minute:30}));
8891

0 commit comments

Comments
 (0)