Skip to content

display Monday as first weekday if locale requires it #7

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

Open
atis-- wants to merge 1 commit into
base: master
Choose a base branch
from
Open

display Monday as first weekday if locale requires it #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions src/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,29 @@ module.exports = React.createClass({
var d2 = m.clone().date(1).day();
var d3 = m.clone().endOf('month').date();

var days = [].concat(
range(d1-d2+1, d1+1),
range(1, d3+1),
range(1, 42-d3-d2+1)
);
// get short names for weekdays in current locale, example:
// ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
var weeks = moment.weekdaysShort();

// check if week starts with Monday
if (moment.localeData().firstDayOfWeek() == 1) {
// swap sunday with monday (weekday names)
weeks.push(weeks.shift());

var weeks = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
if (d2 == 0)
d2 = 7; // convert to ISO day of the week (1..7)
var days = [].concat(
range(d1-d2+2, d1+1),
range(1, d3+1),
range(1, 42-d3-d2+2)
);
} else {
var days = [].concat(
range(d1-d2+1, d1+1),
range(1, d3+1),
range(1, 42-d3-d2+1)
);
}

return (
<div className={cx('m-calendar', this.props.className)}>
Expand Down