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.

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

Jump to bottom

[locale] ca: Change future relative time #3563

Closed
wants to merge 1 commit into from
Closed

[locale] ca: Change future relative time #3563

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/locale/ca.js
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ export default moment.defineLocale('ca', {
sameElse : 'L'
},
relativeTime : {
future : 'en %s',
future : 'd\'aquí %s',
past : 'fa %s',
s : 'uns segons',
m : 'un minut',
Expand Down
6 changes: 3 additions & 3 deletions src/test/locale/ca.js
View file
Open in desktop
Expand Up @@ -137,7 +137,7 @@ test('from', function (assert) {
});

test('suffix', function (assert) {
assert.equal(moment(30000).from(0), 'en uns segons', 'prefix');
assert.equal(moment(30000).from(0), 'd\'aquí uns segons', 'prefix');
assert.equal(moment(0).from(30000), 'fa uns segons', 'suffix');
});

Expand All @@ -146,8 +146,8 @@ test('now from now', function (assert) {
});

test('fromNow', function (assert) {
assert.equal(moment().add({s: 30}).fromNow(), 'en uns segons', 'en uns segons');
assert.equal(moment().add({d: 5}).fromNow(), 'en 5 dies', 'en 5 dies');
assert.equal(moment().add({s: 30}).fromNow(), 'd\'aquí uns segons', 'd\'aquí uns segons');
assert.equal(moment().add({d: 5}).fromNow(), 'd\'aquí 5 dies', 'd\'aquí 5 dies');
});

test('calendar day', function (assert) {
Expand Down