Skip to content

Commit

Permalink
feat(datepicker): Added Slovenian locale support for datepicker (#4035)
Browse files Browse the repository at this point in the history 
* Added Slovenian locale support for datepicker

* Added missing import for Slovenian locale

* Added tests for sl locale and bug fix.
  • Loading branch information
@mihan @valorkin
mihan authored and valorkin committed Apr 25, 2018
1 parent 91ffd36 commit 6e2e60f
Show file tree
Hide file tree
Showing 4 changed files with 379 additions and 3 deletions.
4 changes: 2 additions & 2 deletions demo/src/app/components/+datepicker/demo-datepicker.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
arLocale, csLocale, daLocale, deLocale, enGbLocale, esDoLocale, esLocale, esUsLocale, frLocale, heLocale, hiLocale,
fiLocale, glLocale,
huLocale, idLocale, itLocale, jaLocale, koLocale, mnLocale, nlBeLocale, nlLocale, plLocale, ptBrLocale, ruLocale,
roLocale, svLocale, thLocale, trLocale, zhCnLocale
roLocale, slLocale, svLocale, thLocale, trLocale, zhCnLocale
} from 'ngx-bootstrap/locale';
import { TabsModule } from 'ngx-bootstrap/tabs';

Expand All @@ -22,7 +22,7 @@ const locales = [
arLocale, csLocale, daLocale, deLocale, enGbLocale, esDoLocale, esLocale, esUsLocale, frLocale, heLocale, hiLocale,
fiLocale, glLocale,
huLocale, idLocale, itLocale, jaLocale, koLocale, mnLocale, nlBeLocale, nlLocale, plLocale, ptBrLocale, ruLocale,
roLocale, svLocale, thLocale, trLocale, zhCnLocale
roLocale, slLocale, svLocale, thLocale, trLocale, zhCnLocale
];
locales.forEach((locale: LocaleData) => defineLocale(locale.abbr, locale));

Expand Down
172 changes: 172 additions & 0 deletions src/chronos/i18n/sl.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
// tslint:disable:comment-format binary-expression-operand-order max-line-length
// tslint:disable:no-bitwise prefer-template cyclomatic-complexity
// tslint:disable:no-shadowed-variable switch-default prefer-const
// tslint:disable:one-variable-per-declaration newline-before-return
// tslint:disable:object-literal-key-quotes

import { LocaleData } from '../locale/locale.class';
import { getDayOfWeek } from '../units/day-of-week';

//! moment.js locale configuration
//! locale : Slovenian [sl]
//! author : mihan : https://github.com/mihan

function processRelativeTime(number: number, withoutSuffix: boolean, key: string, isFuture: boolean): string {
var result = number + ' ';
switch (key) {
case 's':
return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
case 'ss':
if (number === 1) {
result += withoutSuffix ? 'sekundo' : 'sekundi';
} else if (number === 2) {
result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah';
} else if (number < 5) {
result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah';
} else {
result += withoutSuffix || isFuture ? 'sekund' : 'sekund';
}
return result;
case 'm':
return withoutSuffix ? 'ena minuta' : 'eno minuto';
case 'mm':
if (number === 1) {
result += withoutSuffix ? 'minuta' : 'minuto';
} else if (number === 2) {
result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
} else if (number < 5) {
result += withoutSuffix || isFuture ? 'minute' : 'minutami';
} else {
result += withoutSuffix || isFuture ? 'minut' : 'minutami';
}
return result;
case 'h':
return withoutSuffix ? 'ena ura' : 'eno uro';
case 'hh':
if (number === 1) {
result += withoutSuffix ? 'ura' : 'uro';
} else if (number === 2) {
result += withoutSuffix || isFuture ? 'uri' : 'urama';
} else if (number < 5) {
result += withoutSuffix || isFuture ? 'ure' : 'urami';
} else {
result += withoutSuffix || isFuture ? 'ur' : 'urami';
}
return result;
case 'd':
return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
case 'dd':
if (number === 1) {
result += withoutSuffix || isFuture ? 'dan' : 'dnem';
} else if (number === 2) {
result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
} else {
result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
}
return result;
case 'M':
return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
case 'MM':
if (number === 1) {
result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
} else if (number === 2) {
result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
} else if (number < 5) {
result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
} else {
result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
}
return result;
case 'y':
return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
case 'yy':
if (number === 1) {
result += withoutSuffix || isFuture ? 'leto' : 'letom';
} else if (number === 2) {
result += withoutSuffix || isFuture ? 'leti' : 'letoma';
} else if (number < 5) {
result += withoutSuffix || isFuture ? 'leta' : 'leti';
} else {
result += withoutSuffix || isFuture ? 'let' : 'leti';
}
return result;
}
}

export const slLocale: LocaleData = {
abbr: 'sl',
months: 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
monthsShort: 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
monthsParseExact: true,
weekdays: 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
weekdaysShort: 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
weekdaysMin: 'ne_po_to_sr_če_pe_so'.split('_'),
weekdaysParseExact: true,
longDateFormat: {
LT: 'H:mm',
LTS: 'H:mm:ss',
L: 'DD.MM.YYYY',
LL: 'D. MMMM YYYY',
LLL: 'D. MMMM YYYY H:mm',
LLLL: 'dddd, D. MMMM YYYY H:mm'
},
calendar: {
sameDay: '[danes ob] LT',
nextDay: '[jutri ob] LT',

nextWeek(date: Date) {
switch (getDayOfWeek(date)) {
case 0:
return '[v] [nedeljo] [ob] LT';
case 3:
return '[v] [sredo] [ob] LT';
case 6:
return '[v] [soboto] [ob] LT';
case 1:
case 2:
case 4:
case 5:
return '[v] dddd [ob] LT';
}
},
lastDay: '[včeraj ob] LT',
lastWeek(date: Date) {
switch (getDayOfWeek(date)) {
case 0:
return '[prejšnjo] [nedeljo] [ob] LT';
case 3:
return '[prejšnjo] [sredo] [ob] LT';
case 6:
return '[prejšnjo] [soboto] [ob] LT';
case 1:
case 2:
case 4:
case 5:
return '[prejšnji] dddd [ob] LT';
}
},
sameElse: 'L'
},
relativeTime: {
future: 'čez %s',
past: 'pred %s',
s: processRelativeTime,
ss: processRelativeTime,
m: processRelativeTime,
mm: processRelativeTime,
h: processRelativeTime,
hh: processRelativeTime,
d: processRelativeTime,
dd: processRelativeTime,
M: processRelativeTime,
MM: processRelativeTime,
y: processRelativeTime,
yy: processRelativeTime
},
dayOfMonthOrdinalParse: /\d{1,2}\./,
ordinal: '%d.',
week: {
dow: 1, // Monday is the first day of the week.
doy: 7 // The week that contains Jan 1st is the first week of the year.
}
};
203 changes: 203 additions & 0 deletions src/chronos/test/locale/sl.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
// tslint:disable:max-line-length max-file-line-count prefer-const forin prefer-template one-variable-per-declaration newline-before-return
// tslint:disable:binary-expression-operand-order comment-format one-line no-var-keyword object-literal-shorthand
// tslint:disable:variable-name no-shadowed-variable

import { assert } from 'chai';
import { moment } from '../chain';
import { slLocale } from '../../i18n/sl';

// localeModule('sl');
describe('locale: sl', () => {
beforeAll(() => {
moment.locale('sl', slLocale);
});

afterAll(() => {
moment.locale('en');
});

it('parse', function () {
var _tests = 'januar jan._februar feb._marec mar._april apr._maj maj._junij jun._julij jul._avgust avg._september sep._oktober okt._november nov._december dec.'.split('_'),
i;

function equalit(input, mmm, i) {
assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
}

let tests: string[][] = [];
for (i = 0; i < 12; i++) {
tests[i] = _tests[i].split(' ');
equalit(tests[i][0], 'MMM', i);
equalit(tests[i][1], 'MMM', i);
equalit(tests[i][0], 'MMMM', i);
equalit(tests[i][1], 'MMMM', i);
equalit(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
equalit(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
equalit(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
equalit(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
}
});

it('format', function () {
var a = [
['dddd, Do MMMM YYYY, h:mm:ss a', 'nedelja, 14. februar 2010, 3:25:50 pm'],
['ddd, hA', 'ned., 3PM'],
['M Mo MM MMMM MMM', '2 2. 02 februar feb.'],
['YYYY YY', '2010 10'],
['D Do DD', '14 14. 14'],
['d do dddd ddd dd', '0 0. nedelja ned. ne'],
['DDD DDDo DDDD', '45 45. 045'],
['w wo ww', '7 7. 07'],
['h hh', '3 03'],
['H HH', '15 15'],
['m mm', '25 25'],
['s ss', '50 50'],
['a A', 'pm PM'],
['[the] DDDo [day of the year]', 'the 45. day of the year'],
['LTS', '15:25:50'],
['L', '14.02.2010'],
['LL', '14. februar 2010'],
['LLL', '14. februar 2010 15:25'],
['LLLL', 'nedelja, 14. februar 2010 15:25'],
['l', '14.2.2010'],
['ll', '14. feb. 2010'],
['lll', '14. feb. 2010 15:25'],
['llll', 'ned., 14. feb. 2010 15:25']
],
b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
i;
for (i = 0; i < a.length; i++) {
assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
}
});

it('format ordinal', function () {
assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');

assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');

assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');

assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
});

it('format month', function () {
var expected = 'januar jan._februar feb._marec mar._april apr._maj maj._junij jun._julij jul._avgust avg._september sep._oktober okt._november nov._december dec.'.split('_'),
i;
for (i = 0; i < expected.length; i++) {
assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
}
});

it('format week', function () {
var expected = 'nedelja ned. ne_ponedeljek pon. po_torek tor. to_sreda sre. sr_četrtek čet. če_petek pet. pe_sobota sob. so'.split('_'),
i;
for (i = 0; i < expected.length; i++) {
assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
}
});

it('from', function () {
var start = moment([2007, 1, 28]);
assert.equal(start.from(moment([2007, 1, 28]).add({ s: 44 }), true), 'nekaj sekund', '44 seconds = a few seconds');
assert.equal(start.from(moment([2007, 1, 28]).add({ s: 45 }), true), 'ena minuta', '45 seconds = a minute');
assert.equal(start.from(moment([2007, 1, 28]).add({ s: 89 }), true), 'ena minuta', '89 seconds = a minute');
assert.equal(start.from(moment([2007, 1, 28]).add({ s: 90 }), true), '2 minuti', '90 seconds = 2 minutes');
assert.equal(start.from(moment([2007, 1, 28]).add({ m: 44 }), true), '44 minut', '44 minutes = 44 minutes');
assert.equal(start.from(moment([2007, 1, 28]).add({ m: 45 }), true), 'ena ura', '45 minutes = an hour');
assert.equal(start.from(moment([2007, 1, 28]).add({ m: 89 }), true), 'ena ura', '89 minutes = an hour');
assert.equal(start.from(moment([2007, 1, 28]).add({ m: 90 }), true), '2 uri', '90 minutes = 2 hours');
assert.equal(start.from(moment([2007, 1, 28]).add({ h: 5 }), true), '5 ur', '5 hours = 5 hours');
assert.equal(start.from(moment([2007, 1, 28]).add({ h: 21 }), true), '21 ur', '21 hours = 21 hours');
assert.equal(start.from(moment([2007, 1, 28]).add({ h: 22 }), true), 'en dan', '22 hours = a day');
assert.equal(start.from(moment([2007, 1, 28]).add({ h: 35 }), true), 'en dan', '35 hours = a day');
assert.equal(start.from(moment([2007, 1, 28]).add({ h: 36 }), true), '2 dni', '36 hours = 2 days');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 1 }), true), 'en dan', '1 day = a day');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 5 }), true), '5 dni', '5 days = 5 days');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 25 }), true), '25 dni', '25 days = 25 days');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 26 }), true), 'en mesec', '26 days = a month');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 30 }), true), 'en mesec', '30 days = a month');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 43 }), true), 'en mesec', '43 days = a month');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 46 }), true), '2 meseca', '46 days = 2 months');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 74 }), true), '2 meseca', '75 days = 2 months');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 76 }), true), '3 mesece', '76 days = 3 months');
assert.equal(start.from(moment([2007, 1, 28]).add({ M: 1 }), true), 'en mesec', '1 month = a month');
assert.equal(start.from(moment([2007, 1, 28]).add({ M: 5 }), true), '5 mesecev', '5 months = 5 months');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 345 }), true), 'eno leto', '345 days = a year');
assert.equal(start.from(moment([2007, 1, 28]).add({ d: 548 }), true), '2 leti', '548 days = 2 years');
assert.equal(start.from(moment([2007, 1, 28]).add({ y: 1 }), true), 'eno leto', '1 year = a year');
assert.equal(start.from(moment([2007, 1, 28]).add({ y: 5 }), true), '5 let', '5 years = 5 years');
});

it('suffix', function () {
assert.equal(moment(30000).from(0), 'čez nekaj sekund', 'prefix');
assert.equal(moment(0).from(30000), 'pred nekaj sekundami', 'suffix');
});

it('fromNow', function () {
assert.equal(moment().add({ s: 30 }).fromNow(), 'čez nekaj sekund', 'in a few seconds');
assert.equal(moment().add({ d: 5 }).fromNow(), 'čez 5 dni', 'in 5 days');
});

it('calendar day', function () {
var a = moment().hours(12).minutes(0).seconds(0);

assert.equal(moment(a).calendar(), 'danes ob 12:00', 'today at the same time');
assert.equal(moment(a).add({ m: 25 }).calendar(), 'danes ob 12:25', 'Now plus 25 min');
assert.equal(moment(a).add({ h: 1 }).calendar(), 'danes ob 13:00', 'Now plus 1 hour');
assert.equal(moment(a).add({ d: 1 }).calendar(), 'jutri ob 12:00', 'tomorrow at the same time');
assert.equal(moment(a).subtract({ h: 1 }).calendar(), 'danes ob 11:00', 'Now minus 1 hour');
assert.equal(moment(a).subtract({ d: 1 }).calendar(), 'včeraj ob 12:00', 'yesterday at the same time');
});


it('calendar all else', function () {
var weeksAgo = moment().subtract({ w: 1 }),
weeksFromNow = moment().add({ w: 1 });

assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '1 week ago');
assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 1 week');

weeksAgo = moment().subtract({ w: 2 });
weeksFromNow = moment().add({ w: 2 });

assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '2 weeks ago');
assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 2 weeks');
});

it('weeks year starting sunday formatted', function () {
assert.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1.', 'Jan 1 2012 should be week 1');
assert.equal(moment([2012, 0, 2]).format('w ww wo'), '2 02 2.', 'Jan 2 2012 should be week 2');
assert.equal(moment([2012, 0, 8]).format('w ww wo'), '2 02 2.', 'Jan 8 2012 should be week 2');
assert.equal(moment([2012, 0, 9]).format('w ww wo'), '3 03 3.', 'Jan 9 2012 should be week 3');
assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3.', 'Jan 15 2012 should be week 3');
});

});
Loading

0 comments on commit 6e2e60f

Please sign in to comment.