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

Update lang/zh-cn.js #1076

Merged
merged 8 commits into from
Oct 13, 2013
Merged

Update lang/zh-cn.js #1076

merged 8 commits into from
Oct 13, 2013

Conversation

zenozeng
Copy link
Contributor

update lang/zh-cn.js, which is more corresponding to the Chinese expression.
更新 lang/zh-cn.js 使之更符合中文表达习惯

@ichernev
Copy link
Contributor

@suupic what do you think? Also can you comment on #1056

@ichernev
Copy link
Contributor

Can you please rebase your changes on top of latest rebase.

@zenozeng
Copy link
Contributor Author

@ichernev OK, I'll update test script & rebase my changes later.

nextWeek : function () {
var startOfWeek, prefix;
startOfWeek = moment().startOf('week');
prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would the time from the start of the week to now be more than 7 days?

You can also use moment().startOfWeek().diff() -- that would give a negative number of milliseconds.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see what you're doing. Ignore my comment :)

@ichernev
Copy link
Contributor

Thank you for fixing those. Sorry for the delay, I was just hoping to get another opinion on that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants