Skip to content

Commit 6a5d0d4

Browse files
author
Rocky Meza
committed
Merge branch 'master' of github.com:timrwood/moment
2 parents 00722f8 + bd3afa6 commit 6a5d0d4

File tree

2 files changed

+382
-0
lines changed

2 files changed

+382
-0
lines changed

‎lang/is.js

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
(function () {
2+
var plural = function (n) {
3+
if (n % 100 == 11) {
4+
return true;
5+
} else if (n % 10 == 1) {
6+
return false;
7+
} else {
8+
return true;
9+
}
10+
},
11+
12+
translate = function (number, withoutSuffix, key, isFuture) {
13+
var result = number + " ";
14+
switch (key) {
15+
case 's':
16+
return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
17+
case 'm':
18+
return withoutSuffix ? 'mínúta' : 'mínútu';
19+
case 'mm':
20+
if (plural(number)) {
21+
return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
22+
} else if (withoutSuffix) {
23+
return result + 'mínúta';
24+
} else {
25+
return result + 'mínútu';
26+
}
27+
case 'hh':
28+
if (plural(number)) {
29+
return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
30+
} else {
31+
return result + 'klukkustund';
32+
}
33+
case 'd':
34+
if (withoutSuffix) {
35+
return 'dagur'
36+
} else {
37+
return isFuture ? 'dag' : 'degi';
38+
}
39+
case 'dd':
40+
if (plural(number)) {
41+
if (withoutSuffix) {
42+
return result + 'dagar'
43+
} else {
44+
return result + (isFuture ? 'daga' : 'dögum');
45+
}
46+
} else if (withoutSuffix) {
47+
return result + 'dagur'
48+
} else {
49+
return result + (isFuture ? 'dag' : 'degi');
50+
}
51+
case 'M':
52+
if (withoutSuffix) {
53+
return 'mánuður'
54+
} else {
55+
return isFuture ? 'mánuð' : 'mánuði';
56+
}
57+
case 'MM':
58+
if (plural(number)) {
59+
if (withoutSuffix) {
60+
return result + 'mánuðir'
61+
} else {
62+
return result + (isFuture ? 'mánuði' : 'mánuðum');
63+
}
64+
} else if (withoutSuffix) {
65+
return result + 'mánuður';
66+
} else {
67+
return result + (isFuture ? 'mánuð' : 'mánuði');
68+
}
69+
case 'y':
70+
return withoutSuffix || isFuture ? 'ár' : 'ári';
71+
case 'yy':
72+
if (plural(number)) {
73+
return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
74+
} else {
75+
return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
76+
}
77+
}
78+
},
79+
80+
lang = {
81+
months : "janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),
82+
monthsShort : "jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),
83+
weekdays : "sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),
84+
weekdaysShort : "sun_mán_þri_mið_fim_fös_lau".split("_"),
85+
longDateFormat : {
86+
LT : "H:mm",
87+
L : "DD/MM/YYYY",
88+
LL : "D. MMMM YYYY",
89+
LLL : "D. MMMM YYYY kl. LT",
90+
LLLL : "dddd, D. MMMM YYYY kl. LT"
91+
},
92+
calendar : {
93+
sameDay : '[í dag kl.] LT',
94+
nextDay : '[á morgun kl.] LT',
95+
nextWeek : 'dddd [kl.] LT',
96+
lastDay : '[í gær kl.] LT',
97+
lastWeek : '[síðasta] dddd [kl.] LT',
98+
sameElse : 'L'
99+
},
100+
relativeTime : {
101+
future : "eftir %s",
102+
past : "fyrir %s síðan",
103+
s : translate,
104+
m : translate,
105+
mm : translate,
106+
h : "klukkustund",
107+
hh : translate,
108+
d : translate,
109+
dd : translate,
110+
M : translate,
111+
MM : translate,
112+
y : translate,
113+
yy : translate,
114+
},
115+
ordinal : function (number) {
116+
return '.';
117+
}
118+
};
119+
120+
// Node
121+
if (typeof module !== 'undefined') {
122+
module.exports = lang;
123+
}
124+
// Browser
125+
if (typeof window !== 'undefined' && this.moment && this.moment.lang) {
126+
this.moment.lang('is', lang);
127+
}
128+
}());

‎test/lang/is.js

+254
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
var moment = require("../../moment");
2+
3+
4+
/**************************************************
5+
Icelandic
6+
*************************************************/
7+
8+
exports["lang:is"] = {
9+
"parse" : function(test) {
10+
test.expect(96);
11+
moment.lang('is');
12+
var tests = 'janúar jan_febrúar feb_mars mar_apríl apr_maí maí_júní jún_júlí júl_ágúst ágú_september sep_október okt_nóvember nóv_desember des'.split("_");
13+
var i;
14+
function equalTest(input, mmm, i) {
15+
test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
16+
}
17+
for (i = 0; i < 12; i++) {
18+
tests[i] = tests[i].split(' ');
19+
equalTest(tests[i][0], 'MMM', i);
20+
equalTest(tests[i][1], 'MMM', i);
21+
equalTest(tests[i][0], 'MMMM', i);
22+
equalTest(tests[i][1], 'MMMM', i);
23+
equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
24+
equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
25+
equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
26+
equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
27+
}
28+
test.done();
29+
},
30+
31+
"format" : function(test) {
32+
test.expect(18);
33+
moment.lang('is');
34+
var a = [
35+
['dddd, Do MMMM YYYY, h:mm:ss a', 'sunnudagur, 14. febrúar 2010, 3:25:50 pm'],
36+
['ddd, hA', 'sun, 3PM'],
37+
['M Mo MM MMMM MMM', '2 2. 02 febrúar feb'],
38+
['YYYY YY', '2010 10'],
39+
['D Do DD', '14 14. 14'],
40+
['d do dddd ddd', '0 0. sunnudagur sun'],
41+
['DDD DDDo DDDD', '45 45. 045'],
42+
['w wo ww', '8 8. 08'],
43+
['h hh', '3 03'],
44+
['H HH', '15 15'],
45+
['m mm', '25 25'],
46+
['s ss', '50 50'],
47+
['a A', 'pm PM'],
48+
['t\\he DDDo \\d\\ay of t\\he ye\\ar', 'the 45. day of the year'],
49+
['L', '14/02/2010'],
50+
['LL', '14. febrúar 2010'],
51+
['LLL', '14. febrúar 2010 kl. 15:25'],
52+
['LLLL', 'sunnudagur, 14. febrúar 2010 kl. 15:25']
53+
],
54+
b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
55+
i;
56+
for (i = 0; i < a.length; i++) {
57+
test.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
58+
}
59+
test.done();
60+
},
61+
62+
"format ordinal" : function(test) {
63+
test.expect(31);
64+
moment.lang('is');
65+
test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
66+
test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
67+
test.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
68+
test.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
69+
test.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
70+
test.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
71+
test.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
72+
test.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
73+
test.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
74+
test.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
75+
76+
test.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
77+
test.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
78+
test.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
79+
test.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
80+
test.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
81+
test.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
82+
test.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
83+
test.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
84+
test.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
85+
test.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
86+
87+
test.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
88+
test.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
89+
test.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
90+
test.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
91+
test.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
92+
test.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
93+
test.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
94+
test.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
95+
test.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
96+
test.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
97+
98+
test.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
99+
test.done();
100+
},
101+
102+
"format month" : function(test) {
103+
test.expect(12);
104+
moment.lang('is');
105+
var expected = 'janúar jan_febrúar feb_mars mar_apríl apr_maí maí_júní jún_júlí júl_ágúst ágú_september sep_október okt_nóvember nóv_desember des'.split("_");
106+
var i;
107+
for (i = 0; i < expected.length; i++) {
108+
test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]);
109+
}
110+
test.done();
111+
},
112+
113+
"format week" : function(test) {
114+
test.expect(7);
115+
moment.lang('is');
116+
var expected = 'sunnudagur sun_mánudagur mán_þriðjudagur þri_miðvikudagur mið_fimmtudagur fim_föstudagur fös_laugardagur lau'.split("_");
117+
var i;
118+
for (i = 0; i < expected.length; i++) {
119+
test.equal(moment([2011, 0, 2 + i]).format('dddd ddd'), expected[i], expected[i]);
120+
}
121+
test.done();
122+
},
123+
124+
"from" : function(test) {
125+
test.expect(34);
126+
moment.lang('is');
127+
var start = moment([2007, 1, 28]);
128+
test.equal(start.from(moment([2007, 1, 28]).add({s:44}), true), "nokkrar sekúndur", "44 seconds = a few seconds");
129+
test.equal(start.from(moment([2007, 1, 28]).add({s:45}), true), "mínúta", "45 seconds = a minute");
130+
test.equal(start.from(moment([2007, 1, 28]).add({s:89}), true), "mínúta", "89 seconds = a minute");
131+
test.equal(start.from(moment([2007, 1, 28]).add({s:90}), true), "2 mínútur", "90 seconds = 2 minutes");
132+
test.equal(start.from(moment([2007, 1, 28]).add({m:44}), true), "44 mínútur", "44 minutes = 44 minutes");
133+
test.equal(start.from(moment([2007, 1, 28]).add({m:21}), true), "21 mínúta", "21 minutes = 21 minutes");
134+
test.equal(start.from(moment([2007, 1, 28]).add({m:45}), true), "klukkustund", "45 minutes = an hour");
135+
test.equal(start.from(moment([2007, 1, 28]).add({m:89}), true), "klukkustund", "89 minutes = an hour");
136+
test.equal(start.from(moment([2007, 1, 28]).add({m:90}), true), "2 klukkustundir", "90 minutes = 2 hours");
137+
test.equal(start.from(moment([2007, 1, 28]).add({h:5}), true), "5 klukkustundir", "5 hours = 5 hours");
138+
test.equal(start.from(moment([2007, 1, 28]).add({h:21}), true), "21 klukkustund", "21 hours = 21 hours");
139+
test.equal(start.from(moment([2007, 1, 28]).add({h:22}), true), "dagur", "22 hours = a day");
140+
test.equal(start.from(moment([2007, 1, 28]).add({h:35}), true), "dagur", "35 hours = a day");
141+
test.equal(start.from(moment([2007, 1, 28]).add({h:36}), true), "2 dagar", "36 hours = 2 days");
142+
test.equal(start.from(moment([2007, 1, 28]).add({d:1}), true), "dagur", "1 day = a day");
143+
test.equal(start.from(moment([2007, 1, 28]).add({d:5}), true), "5 dagar", "5 days = 5 days");
144+
test.equal(start.from(moment([2007, 1, 28]).add({d:25}), true), "25 dagar", "25 days = 25 days");
145+
test.equal(start.from(moment([2007, 1, 28]).add({d:11}), true), "11 dagar", "11 days = 11 days");
146+
test.equal(start.from(moment([2007, 1, 28]).add({d:21}), true), "21 dagur", "21 days = 21 days");
147+
test.equal(start.from(moment([2007, 1, 28]).add({d:26}), true), "mánuður", "26 days = a month");
148+
test.equal(start.from(moment([2007, 1, 28]).add({d:30}), true), "mánuður", "30 days = a month");
149+
test.equal(start.from(moment([2007, 1, 28]).add({d:45}), true), "mánuður", "45 days = a month");
150+
test.equal(start.from(moment([2007, 1, 28]).add({d:46}), true), "2 mánuðir", "46 days = 2 months");
151+
test.equal(start.from(moment([2007, 1, 28]).add({d:74}), true), "2 mánuðir", "75 days = 2 months");
152+
test.equal(start.from(moment([2007, 1, 28]).add({d:76}), true), "3 mánuðir", "76 days = 3 months");
153+
test.equal(start.from(moment([2007, 1, 28]).add({M:1}), true), "mánuður", "1 month = a month");
154+
test.equal(start.from(moment([2007, 1, 28]).add({M:5}), true), "5 mánuðir", "5 months = 5 months");
155+
test.equal(start.from(moment([2007, 1, 28]).add({d:344}), true), "11 mánuðir", "344 days = 11 months");
156+
test.equal(start.from(moment([2007, 1, 28]).add({d:345}), true), "ár", "345 days = a year");
157+
test.equal(start.from(moment([2007, 1, 28]).add({d:547}), true), "ár", "547 days = a year");
158+
test.equal(start.from(moment([2007, 1, 28]).add({d:548}), true), "2 ár", "548 days = 2 years");
159+
test.equal(start.from(moment([2007, 1, 28]).add({y:1}), true), "ár", "1 year = a year");
160+
test.equal(start.from(moment([2007, 1, 28]).add({y:5}), true), "5 ár", "5 years = 5 years");
161+
test.equal(start.from(moment([2007, 1, 28]).add({y:21}), true), "21 ár", "21 years = 21 years");
162+
test.done();
163+
},
164+
165+
"suffix" : function(test) {
166+
test.expect(3);
167+
moment.lang('is');
168+
test.equal(moment(30000).from(0), "eftir nokkrar sekúndur", "prefix");
169+
test.equal(moment(0).from(30000), "fyrir nokkrum sekúndum síðan", "suffix");
170+
test.equal(moment().subtract({m:1}).fromNow(), "fyrir mínútu síðan", "a minute ago");
171+
test.done();
172+
},
173+
174+
"now from now" : function(test) {
175+
test.expect(1);
176+
moment.lang('is');
177+
test.equal(moment().fromNow(), "fyrir nokkrum sekúndum síðan", "now from now should display as in the past");
178+
test.done();
179+
},
180+
181+
"fromNow" : function(test) {
182+
test.expect(3);
183+
moment.lang('is');
184+
test.equal(moment().add({s:30}).fromNow(), "eftir nokkrar sekúndur", "in a few seconds");
185+
test.equal(moment().add({m:1}).fromNow(), "eftir mínútu", "in a minute");
186+
test.equal(moment().add({d:5}).fromNow(), "eftir 5 daga", "in 5 days");
187+
test.done();
188+
},
189+
190+
"calendar day" : function(test) {
191+
test.expect(6);
192+
moment.lang('is');
193+
194+
var a = moment().hours(2).minutes(0).seconds(0);
195+
196+
test.equal(moment(a).calendar(), "í dag kl. 2:00", "today at the same time");
197+
test.equal(moment(a).add({ m: 25 }).calendar(), "í dag kl. 2:25", "Now plus 25 min");
198+
test.equal(moment(a).add({ h: 1 }).calendar(), "í dag kl. 3:00", "Now plus 1 hour");
199+
test.equal(moment(a).add({ d: 1 }).calendar(), "á morgun kl. 2:00", "tomorrow at the same time");
200+
test.equal(moment(a).subtract({ h: 1 }).calendar(), "í dag kl. 1:00", "Now minus 1 hour");
201+
test.equal(moment(a).subtract({ d: 1 }).calendar(), "í gær kl. 2:00", "yesterday at the same time");
202+
test.done();
203+
},
204+
205+
"calendar next week" : function(test) {
206+
test.expect(15);
207+
moment.lang('is');
208+
209+
var i;
210+
var m;
211+
212+
for (i = 2; i < 7; i++) {
213+
m = moment().add({ d: i });
214+
test.equal(m.calendar(), m.format('dddd [kl.] LT'), "Today + " + i + " days current time");
215+
m.hours(0).minutes(0).seconds(0).milliseconds(0);
216+
test.equal(m.calendar(), m.format('dddd [kl.] LT'), "Today + " + i + " days beginning of day");
217+
m.hours(23).minutes(59).seconds(59).milliseconds(999);
218+
test.equal(m.calendar(), m.format('dddd [kl.] LT'), "Today + " + i + " days end of day");
219+
}
220+
test.done();
221+
},
222+
223+
"calendar last week" : function(test) {
224+
test.expect(15);
225+
moment.lang('is');
226+
227+
for (i = 2; i < 7; i++) {
228+
m = moment().subtract({ d: i });
229+
test.equal(m.calendar(), m.format('[síðasta] dddd [kl.] LT'), "Today - " + i + " days current time");
230+
m.hours(0).minutes(0).seconds(0).milliseconds(0);
231+
test.equal(m.calendar(), m.format('[síðasta] dddd [kl.] LT'), "Today - " + i + " days beginning of day");
232+
m.hours(23).minutes(59).seconds(59).milliseconds(999);
233+
test.equal(m.calendar(), m.format('[síðasta] dddd [kl.] LT'), "Today - " + i + " days end of day");
234+
}
235+
test.done();
236+
},
237+
238+
"calendar all else" : function(test) {
239+
test.expect(4);
240+
moment.lang('is');
241+
var weeksAgo = moment().subtract({ w: 1 });
242+
var weeksFromNow = moment().add({ w: 1 });
243+
244+
test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "1 week ago");
245+
test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "in 1 week");
246+
247+
weeksAgo = moment().subtract({ w: 2 });
248+
weeksFromNow = moment().add({ w: 2 });
249+
250+
test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "2 weeks ago");
251+
test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "in 2 weeks");
252+
test.done();
253+
}
254+
};

0 commit comments

Comments
 (0)