Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(datepicker): add catalan lang #4969

Merged
merged 6 commits into from
Jan 17, 2019
Merged

feat(datepicker): add catalan lang #4969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0325dda
added catalan lang
Dec 17, 2018
7cbf799
cannot find module ngx bootstrap
Dec 17, 2018
f864bba
solved some traduction typos and tests passed
Dec 19, 2018
2e85b99
revert unnecesary changes
Dec 21, 2018
b99b5bb
Merge branch 'development' of github.com:XavisaurusRex/ngx-bootstrap …
Dec 21, 2018
cbe45f7
revert package.json changes
Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions demo/src/app/components/+datepicker/demo-datepicker.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { RouterModule } from '@angular/router';
import { defineLocale, LocaleData } from 'ngx-bootstrap/chronos';
import { BsDatepickerModule, DatepickerModule } from 'ngx-bootstrap/datepicker';
import {
arLocale, bgLocale, csLocale, daLocale, deLocale, enGbLocale, esDoLocale, esLocale, esUsLocale, frLocale, heLocale,
arLocale, bgLocale, caLocale, csLocale, daLocale, deLocale, enGbLocale, esDoLocale, esLocale, esUsLocale, frLocale, heLocale,
hiLocale, fiLocale, glLocale, huLocale, idLocale, itLocale, jaLocale, koLocale, ltLocale, mnLocale, nbLocale,
nlBeLocale, nlLocale, plLocale, ptBrLocale, ruLocale, roLocale, skLocale, slLocale, svLocale, thLocale, trLocale,
zhCnLocale
Expand All @@ -19,10 +19,10 @@ import { routes } from './demo-datepicker.routes';
import { DEMO_COMPONENTS } from './demos';

const locales = [
arLocale, bgLocale, csLocale, daLocale, deLocale, enGbLocale, esDoLocale, esLocale, esUsLocale, frLocale, heLocale,
hiLocale, fiLocale, glLocale, huLocale, idLocale, itLocale, jaLocale, koLocale, ltLocale, mnLocale, nbLocale,
nlBeLocale, nlLocale, plLocale, ptBrLocale, ruLocale, roLocale, skLocale, slLocale, svLocale, thLocale, trLocale,
zhCnLocale
arLocale, bgLocale, caLocale, csLocale, daLocale, deLocale, enGbLocale, esDoLocale, esLocale, esUsLocale, frLocale,
heLocale, hiLocale, fiLocale, glLocale, huLocale, idLocale, itLocale, jaLocale, koLocale, ltLocale, mnLocale,
nbLocale, nlBeLocale, nlLocale, plLocale, ptBrLocale, ruLocale, roLocale, skLocale, slLocale, svLocale, thLocale,
trLocale, zhCnLocale
];

locales.forEach((locale: LocaleData) => {
Expand Down
99 changes: 99 additions & 0 deletions src/chronos/i18n/ca.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
// 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

import { LocaleData } from '../locale/locale.class';
import { getHours, getMonth } from '../utils/date-getters';

//! moment.js locale configuration
//! locale : Catalan [ca]
//! author : Xavier Arbat : https://github.com/XavisaurusRex

let monthsShortDot = 'gen._feb._mar._abr._mai._jun._jul._ago._set._oct._nov._des.'.split('_'),
monthsShort = 'ene_feb_mar_abr_mai_jun_jul_ago_set_oct_nov_des'.split('_');

let monthsParse = [/^gen/i, /^feb/i, /^mar/i, /^abr/i, /^mai/i, /^jun/i, /^jul/i, /^ago/i, /^set/i, /^oct/i, /^nov/i, /^des/i];
let monthsRegex = /^(gener|febrer|març|abril|maig|juny|juliol|agost|setembre|octubre|novembre|desembre|gen\.?|feb\.?|mar\.?|abr\.?|mai\.?|jun\.?|jul\.?|ago\.?|set\.?|oct\.?|nov\.?|des\.?)/i;

export const caLocale: LocaleData = {
abbr: 'ca',
months: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
monthsShort(date: Date, format: string, isUTC?: boolean): string | string[] {
if (!date) {
return monthsShortDot;
}

if (/-MMM-/.test(format)) {
return monthsShort[getMonth(date, isUTC)];
}

return monthsShortDot[getMonth(date, isUTC)];
},
monthsRegex,
monthsShortRegex: monthsRegex,
monthsStrictRegex: /^(gener|febrer|març|abril|maig|juny|juliol|agost|setembre|octubre|novembre|desembre)/i,
monthsShortStrictRegex: /^(gen\.?|feb\.?|mar\.?|abr\.?|mai\.?|jun\.?|jul\.?|ago\.?|set\.?|oct\.?|nov\.?|des\.?)/i,
monthsParse,
longMonthsParse: monthsParse,
shortMonthsParse: monthsParse,
weekdays: 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
weekdaysShort: 'diu._dil._dim._dix._dij._div._dis.'.split('_'),
weekdaysMin: 'dg_dl_dt_dc_dj_dv_ds'.split('_'),
weekdaysParseExact: true,
longDateFormat: {
LT: 'H:mm',
LTS: 'H:mm:ss',
L: 'DD/MM/YYYY',
LL: 'D [de] MMMM [de] YYYY',
LLL: 'D [de] MMMM [de] YYYY H:mm',
LLLL: 'dddd, D [de] MMMM [de] YYYY H:mm'
},
calendar: {
sameDay(date: Date) {
return '[avui a ' + ('la' + (getHours(date) !== 1) ? 'les' : '') + '] LT';
},
nextDay(date: Date) {
return '[dema a ' + ('la' + (getHours(date) !== 1) ? 'les' : '') + '] LT';
},
nextWeek(date: Date) {
return 'dddd [a ' + ('la' + (getHours(date) !== 1) ? 'les' : '') + '] LT';
},
lastDay(date: Date) {
return '[ahir a ' + ('la' + (getHours(date) !== 1) ? 'les' : '') + '] LT';
},
lastWeek(date: Date) {
return '[el] dddd [' + ('passada la ' + (getHours(date) !== 1) ? 'passades les' : '') + '] LT';
},
sameElse: 'L'
},
relativeTime: {
future: 'en %s',
past: 'fa %s',
s: 'uns segons',
ss: '%d segons',
m: 'un minut',
mm: '%d minuts',
h: 'una hora',
hh: '%d hores',
d: 'un dia',
dd: '%d dies',
M: 'un mes',
MM: '%d mesos',
y: 'un any',
yy: '%d anys'
},
dayOfMonthOrdinalParse: /\d{1,2}(er|on|er|rt|é)/,
ordinal(_num: number): string {
const num = Number(_num);
const output = (num > 4) ? 'é' :
(num === 1 || num === 3) ? 'r' :
(num === 2) ? 'n' :
(num === 4) ? 't' : 'é';
return num + output;
},
week: {
dow: 1, // Monday is the first day of the week.
doy: 4 // The week that contains Jan 4th is the first week of the year.
}
};
1 change: 1 addition & 0 deletions src/chronos/public_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export { TimeUnit } from './types';

export { arLocale } from './i18n/ar';
export { bgLocale } from './i18n/bg';
export { caLocale } from './i18n/ca';
export { csLocale } from './i18n/cs';
export { daLocale } from './i18n/da';
export { deLocale } from './i18n/de';
Expand Down
239 changes: 239 additions & 0 deletions src/chronos/test/locale/ca.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
// 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 { assertEq, assertDeepEq } from '../test-helpers';
import { moment } from '../chain';
import { caLocale } from '../../i18n/ca';

// localeModule('en');
describe('locale: ca', () => {
beforeAll(() => {
moment.locale('ca', caLocale);
});

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

it('parse', function () {
var i,
_tests: string[] = 'gener gen_febrer feb_març mar_abril abr_maig mai_juny jun_juliol jul_agost ago_setembre set_octubre oct_novembre nov_desembre des'.split('_');

function equalTest(input: string, mmm: string, i: number) {
assertEq(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(' ');
equalTest(tests[i][0], 'MMM', i);
equalTest(tests[i][1], 'MMM', i);
equalTest(tests[i][0], 'MMMM', i);
equalTest(tests[i][1], 'MMMM', i);
equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
}
});

it('format', function () {
var a = [
['dddd, MMMM Do YYYY, h:mm:ss a', 'diumenge, febrer 14é 2010, 3:25:50 pm'],
['ddd, hA', 'diu., 3PM'],
['M Mo MM MMMM MMM', '2 2n 02 febrer feb.'],
['YYYY YY', '2010 10'],
['D Do DD', '14 14é 14'],
['d do dddd ddd dd', '0 0é diumenge diu. dg'],
['DDD DDDo DDDD', '45 45é 045'],
['w wo ww', '6 6é 06'],
['YYYY-MMM-DD', '2010-feb-14'],
['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 de febrer de 2010'],
['LLL', '14 de febrer de 2010 15:25'],
['LLLL', 'diumenge, 14 de febrer de 2010 15:25'],
['l', '14/2/2010'],
['ll', '14 de feb. de 2010'],
['lll', '14 de feb. de 2010 15:25'],
['llll', 'diu., 14 de feb. de 2010 15:25']
],
b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
i;
for (i = 0; i < a.length; i++) {
assertEq(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
}
});

it('format ordinal', function () {
assertEq(moment([2011, 0, 1]).format('DDDo'), '1r', '1r');
assertEq(moment([2011, 0, 2]).format('DDDo'), '2n', '2n');
assertEq(moment([2011, 0, 3]).format('DDDo'), '3r', '3r');
assertEq(moment([2011, 0, 4]).format('DDDo'), '4t', '4t');
assertEq(moment([2011, 0, 5]).format('DDDo'), '5é', '5é');
assertEq(moment([2011, 0, 6]).format('DDDo'), '6é', '6é');
assertEq(moment([2011, 0, 7]).format('DDDo'), '7é', '7é');
assertEq(moment([2011, 0, 8]).format('DDDo'), '8é', '8é');
assertEq(moment([2011, 0, 9]).format('DDDo'), '9é', '9é');
assertEq(moment([2011, 0, 10]).format('DDDo'), '10é', '10é');

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

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

assertEq(moment([2011, 0, 31]).format('DDDo'), '31é', '31é');
});

it('format month', function () {
var expected = 'gener gen._febrer feb._març mar._abril abr._maig mai._juny jun._juliol jul._agost ago._setembre set._octubre oct._novembre nov._desembre des.'.split('_'),
i;
for (i = 0; i < expected.length; i++) {
assertEq(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
}
});

it('format week', function () {
var expected = 'diumenge diu. dg_dilluns dil. dl_dimarts dim. dt_dimecres dix. dc_dijous dij. dj_divendres div. dv_dissabte dis. ds'.split('_'),
i;
for (i = 0; i < expected.length; i++) {
assertEq(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
}
});

it('from', function () {
var start = moment([2007, 1, 28]);
assertEq(start.from(moment([2007, 1, 28]).add({ s: 44 }), true), 'uns segons', '44 segons = a few seconds');
assertEq(start.from(moment([2007, 1, 28]).add({ s: 45 }), true), 'un minut', '45 segons = a minute');
assertEq(start.from(moment([2007, 1, 28]).add({ s: 89 }), true), 'un minut', '89 segons = a minute');
assertEq(start.from(moment([2007, 1, 28]).add({ s: 90 }), true), '2 minuts', '90 segons = 2 minutes');
assertEq(start.from(moment([2007, 1, 28]).add({ m: 44 }), true), '44 minuts', '44 minuts = 44 minutes');
assertEq(start.from(moment([2007, 1, 28]).add({ m: 45 }), true), 'una hora', '45 minuts = an hour');
assertEq(start.from(moment([2007, 1, 28]).add({ m: 89 }), true), 'una hora', '89 minuts = an hour');
assertEq(start.from(moment([2007, 1, 28]).add({ m: 90 }), true), '2 hores', '90 minuts = 2 hours');
assertEq(start.from(moment([2007, 1, 28]).add({ h: 5 }), true), '5 hores', '5 hores = 5 hours');
assertEq(start.from(moment([2007, 1, 28]).add({ h: 21 }), true), '21 hores', '21 hores = 21 hours');
assertEq(start.from(moment([2007, 1, 28]).add({ h: 22 }), true), 'un dia', '22 hores = a day');
assertEq(start.from(moment([2007, 1, 28]).add({ h: 35 }), true), 'un dia', '35 hores = a day');
assertEq(start.from(moment([2007, 1, 28]).add({ h: 36 }), true), '2 dies', '36 hores = 2 days');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 1 }), true), 'un dia', '1 dia = a day');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 5 }), true), '5 dies', '5 dies = 5 days');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 25 }), true), '25 dies', '25 dies = 25 days');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 26 }), true), 'un mes', '26 dies = a month');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 30 }), true), 'un mes', '30 dies = a month');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 43 }), true), 'un mes', '43 dies = a month');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 46 }), true), '2 mesos', '46 dies = 2 months');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 74 }), true), '2 mesos', '75 dies = 2 months');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 76 }), true), '3 mesos', '76 dies = 3 months');
assertEq(start.from(moment([2007, 1, 28]).add({ M: 1 }), true), 'un mes', '1 mes = a month');
assertEq(start.from(moment([2007, 1, 28]).add({ M: 5 }), true), '5 mesos', '5 mesos = 5 months');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 345 }), true), 'un any', '345 dies = a year');
assertEq(start.from(moment([2007, 1, 28]).add({ d: 548 }), true), '2 anys', '548 dies = 2 years');
assertEq(start.from(moment([2007, 1, 28]).add({ y: 1 }), true), 'un any', '1 any = a year');
assertEq(start.from(moment([2007, 1, 28]).add({ y: 5 }), true), '5 anys', '5 anys = 5 years');
});

it('suffix', function () {
assertEq(moment(30000).from(0), 'en uns segons', 'prefix');
assertEq(moment(0).from(30000), 'fa uns segons', 'suffix');
});

it('now from now', function () {
assertEq(moment().fromNow(), 'fa uns segons', 'now from now should display as in the past');
});

it('fromNow', function () {
assertEq(moment().add({ s: 30 }).fromNow(), 'en uns segons', 'en uns segons');
assertEq(moment().add({ d: 5 }).fromNow(), 'en 5 dies', 'en 5 dies');
});

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

assertEq(moment(a).calendar(), 'avui a les 12:00', 'today at the same time');
assertEq(moment(a).add({ m: 25 }).calendar(), 'avui a les 12:25', 'Now plus 25 min');
assertEq(moment(a).add({ h: 1 }).calendar(), 'avui a les 13:00', 'Now plus 1 hour');
assertEq(moment(a).add({ d: 1 }).calendar(), 'dema a les 12:00', 'tomorrow at the same time');
assertEq(moment(a).add({ d: 1, h: -1 }).calendar(), 'dema a les 11:00', 'tomorrow minus 1 hour');
assertEq(moment(a).subtract({ h: 1 }).calendar(), 'avui a les 11:00', 'Now minus 1 hour');
assertEq(moment(a).subtract({ d: 1 }).calendar(), 'ahir a les 12:00', 'yesterday at the same time');
});

it('calendar next week', function () {
var i, m;

for (i = 2; i < 7; i++) {
m = moment().add({ d: i });
assertEq(m.calendar(), m.format('dddd [a ' + ('la' + (m.hours() !== 1) ? 'les' : '') + '] LT'), 'Today + ' + i + ' days current time');
m.hours(0).minutes(0).seconds(0).milliseconds(0);
assertEq(m.calendar(), m.format('dddd [a ' + ('la' + (m.hours() !== 1) ? 'les' : '') + '] LT'), 'Today + ' + i + ' days beginning of day');
m.hours(23).minutes(59).seconds(59).milliseconds(999);
assertEq(m.calendar(), m.format('dddd [a ' + ('la' + (m.hours() !== 1) ? 'les' : '') + '] LT'), 'Today + ' + i + ' days end of day');
}
});

it('calendar last week', function () {
var i, m;

for (i = 2; i < 7; i++) {
m = moment().subtract({ d: i });
assertEq(m.calendar(), m.format('[el] dddd [' + ('passada la ' + (m.hours() !== 1) ? 'passades les' : '') + '] LT'), 'Today - ' + i + ' days current time');
m.hours(0).minutes(0).seconds(0).milliseconds(0);
assertEq(m.calendar(), m.format('[el] dddd [' + ('passada la ' + (m.hours() !== 1) ? 'passades les' : '') + '] LT'), 'Today - ' + i + ' days beginning of day');
m.hours(23).minutes(59).seconds(59).milliseconds(999);
assertEq(m.calendar(), m.format('[el] dddd [' + ('passada la ' +(m.hours() !== 1) ? 'passades les' : '') + '] LT'), 'Today - ' + i + ' days end of day');
}
});

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

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

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

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

it('weeks year starting sunday formatted', function () {
assertEq(moment([2012, 0, 1]).format('w ww wo'), '52 52 52é', 'Jan 1 2012 should be week 52');
assertEq(moment([2012, 0, 2]).format('w ww wo'), '1 01 1r', 'Jan 2 2012 should be week 1');
assertEq(moment([2012, 0, 8]).format('w ww wo'), '1 01 1r', 'Jan 8 2012 should be week 1');
assertEq(moment([2012, 0, 9]).format('w ww wo'), '2 02 2n', 'Jan 9 2012 should be week 2');
assertEq(moment([2012, 0, 15]).format('w ww wo'), '2 02 2n', 'Jan 15 2012 should be week 2');
});

it('test short months proper', function () {
var str = '02-ago-2016';
assertEq(moment(str, 'DD-MMM-YYYY').month(), 7, '02-ago-2016 month should be 7');
});

});
1 change: 1 addition & 0 deletions src/locale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export { arLocale } from './chronos/i18n/ar';
export { bgLocale } from './chronos/i18n/bg';
export { caLocale } from './chronos/i18n/ca';
export { csLocale } from './chronos/i18n/cs';
export { daLocale } from './chronos/i18n/da';
export { deLocale } from './chronos/i18n/de';
Expand Down
1 change: 1 addition & 0 deletions src/locale/public_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export { arLocale } from 'ngx-bootstrap/chronos';
export { bgLocale } from 'ngx-bootstrap/chronos';
export { caLocale } from 'ngx-bootstrap/chronos';
export { csLocale } from 'ngx-bootstrap/chronos';
export { daLocale } from 'ngx-bootstrap/chronos';
export { deLocale } from 'ngx-bootstrap/chronos';
Expand Down