From: Pere Orga <pere@orga.cat>
Date: Thu, 3 Nov 2016 19:43:56 +0000 (+0100)
Subject: Improve Catalan localization
X-Git-Tag: 2.17.0~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=560695112f1a3cd3937eddd00665d2f3ceeb8afd;p=thirdparty%2Fmoment.git

Improve Catalan localization
---

diff --git a/src/locale/ca.js b/src/locale/ca.js
index 7e9c57089..17f50b5d8 100644
--- a/src/locale/ca.js
+++ b/src/locale/ca.js
@@ -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',
diff --git a/src/test/locale/ca.js b/src/test/locale/ca.js
index b769c821f..cefe2e7c8 100644
--- a/src/test/locale/ca.js
+++ b/src/test/locale/ca.js
@@ -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');
 });
 
@@ -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) {