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.

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

Set delimiter between hours and minutes to colon #1882

Closed
wants to merge 3 commits into from
Closed

Set delimiter between hours and minutes to colon #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed34135
Set delimiter between hours and minutes to colon
saxicek Aug 25, 2014
765eb15
Corrected expectations for locale/CS
saxicek Aug 25, 2014
4869394
Corrected expectations for locale/CS
saxicek Aug 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion locale/cs.js
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@
weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
longDateFormat : {
LT: 'H.mm',
LT: 'H:mm',
L : 'DD. MM. YYYY',
LL : 'D. MMMM YYYY',
LLL : 'D. MMMM YYYY LT',
Expand Down
20 changes: 10 additions & 10 deletions test/locale/cs.js
View file
Open in desktop
Expand Up @@ -56,12 +56,12 @@ exports['locale:cs'] = {
['DDDo [den v roce]', '45. den v roce'],
['L', '14. 02. 2010'],
['LL', '14. únor 2010'],
['LLL', '14. únor 2010 15.25'],
['LLLL', 'neděle 14. únor 2010 15.25'],
['LLL', '14. únor 2010 15:25'],
['LLLL', 'neděle 14. únor 2010 15:25'],
['l', '14. 2. 2010'],
['ll', '14. úno 2010'],
['lll', '14. úno 2010 15.25'],
['llll', 'ne 14. úno 2010 15.25']
['lll', '14. úno 2010 15:25'],
['llll', 'ne 14. úno 2010 15:25']
],
b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
i;
Expand Down Expand Up @@ -212,12 +212,12 @@ exports['locale:cs'] = {
'calendar day' : function (test) {
var a = moment().hours(2).minutes(0).seconds(0);

test.equal(moment(a).calendar(), 'dnes v 2.00', 'today at the same time');
test.equal(moment(a).add({m: 25}).calendar(), 'dnes v 2.25', 'Now plus 25 min');
test.equal(moment(a).add({h: 1}).calendar(), 'dnes v 3.00', 'Now plus 1 hour');
test.equal(moment(a).add({d: 1}).calendar(), 'zítra v 2.00', 'tomorrow at the same time');
test.equal(moment(a).subtract({h: 1}).calendar(), 'dnes v 1.00', 'Now minus 1 hour');
test.equal(moment(a).subtract({d: 1}).calendar(), 'včera v 2.00', 'yesterday at the same time');
test.equal(moment(a).calendar(), 'dnes v 2:00', 'today at the same time');
test.equal(moment(a).add({m: 25}).calendar(), 'dnes v 2:25', 'Now plus 25 min');
test.equal(moment(a).add({h: 1}).calendar(), 'dnes v 3:00', 'Now plus 1 hour');
test.equal(moment(a).add({d: 1}).calendar(), 'zítra v 2:00', 'tomorrow at the same time');
test.equal(moment(a).subtract({h: 1}).calendar(), 'dnes v 1:00', 'Now minus 1 hour');
test.equal(moment(a).subtract({d: 1}).calendar(), 'včera v 2:00', 'yesterday at the same time');
test.done();
},

Expand Down