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

Conversation

Projects
None yet
2 participants
@zenozeng
Contributor

zenozeng commented Sep 13, 2013

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

@ichernev

This comment has been minimized.

Contributor

ichernev commented Sep 13, 2013

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

@ichernev

This comment has been minimized.

Contributor

ichernev commented Sep 14, 2013

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

@zenozeng

This comment has been minimized.

Contributor

zenozeng commented Sep 14, 2013

@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 ? '[下]' : '[本]';

This comment has been minimized.

@ichernev

ichernev Oct 13, 2013

Contributor

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.

This comment has been minimized.

@ichernev

ichernev Oct 13, 2013

Contributor

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

@ichernev

This comment has been minimized.

Contributor

ichernev commented Oct 13, 2013

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

@ichernev ichernev merged commit ea2ab37 into moment:develop Oct 13, 2013

1 check passed

default The Travis CI build passed
Details

@icambron icambron referenced this pull request Oct 14, 2013

Closed

Chinese tests failing #1184

@lae lae referenced this pull request Oct 28, 2013

Merged

Update moment.js to 2.4.0 #2052

@theurere theurere referenced this pull request Jul 1, 2014

Merged

Update moment.js to 2.7.0 #58

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment