From: Huáng Jùnliàng <i@jhuang.me>
Date: Tue, 10 Jul 2018 05:27:38 +0000 (+0800)
Subject: [locale] zh: align relativeTime.future to CLDR 33
X-Git-Tag: 2.25.0~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe0eeb25c7e058de56a9b56604fb36defa62651;p=thirdparty%2Fmoment.git

[locale] zh: align relativeTime.future to CLDR 33

see `future-other` section of https://www.unicode.org/cldr/charts/33/by_type/date_&_time.fields.html
---

diff --git a/src/locale/zh-cn.js b/src/locale/zh-cn.js
index 331162357..c77529546 100644
--- a/src/locale/zh-cn.js
+++ b/src/locale/zh-cn.js
@@ -82,7 +82,7 @@ export default moment.defineLocale('zh-cn', {
         }
     },
     relativeTime: {
-        future: '%s内',
+        future: '%s后',
         past: '%s前',
         s: '几秒',
         ss: '%d 秒',
diff --git a/src/locale/zh-hk.js b/src/locale/zh-hk.js
index b4bc2edf6..78a10190e 100644
--- a/src/locale/zh-hk.js
+++ b/src/locale/zh-hk.js
@@ -83,7 +83,7 @@ export default moment.defineLocale('zh-hk', {
         }
     },
     relativeTime: {
-        future: '%s內',
+        future: '%s後',
         past: '%s前',
         s: '幾秒',
         ss: '%d 秒',
diff --git a/src/locale/zh-tw.js b/src/locale/zh-tw.js
index 7301fecbd..aa98ab105 100644
--- a/src/locale/zh-tw.js
+++ b/src/locale/zh-tw.js
@@ -81,7 +81,7 @@ export default moment.defineLocale('zh-tw', {
         }
     },
     relativeTime: {
-        future: '%s內',
+        future: '%s後',
         past: '%s前',
         s: '幾秒',
         ss: '%d 秒',
diff --git a/src/test/locale/zh-cn.js b/src/test/locale/zh-cn.js
index 2acfaca11..940836a4b 100644
--- a/src/test/locale/zh-cn.js
+++ b/src/test/locale/zh-cn.js
@@ -242,7 +242,7 @@ test('from', function (assert) {
 });
 
 test('suffix', function (assert) {
-    assert.equal(moment(30000).from(0), '几秒内', 'prefix');
+    assert.equal(moment(30000).from(0), '几秒后', 'prefix');
     assert.equal(moment(0).from(30000), '几秒前', 'suffix');
 });
 
@@ -257,10 +257,10 @@ test('now from now', function (assert) {
 test('fromNow', function (assert) {
     assert.equal(
         moment().add({ s: 30 }).fromNow(),
-        '几秒内',
+        '几秒后',
         'in a few seconds'
     );
-    assert.equal(moment().add({ d: 5 }).fromNow(), '5 天内', 'in 5 days');
+    assert.equal(moment().add({ d: 5 }).fromNow(), '5 天后', 'in 5 days');
 });
 
 test('calendar day', function (assert) {
diff --git a/src/test/locale/zh-hk.js b/src/test/locale/zh-hk.js
index e71581589..b83e5debe 100644
--- a/src/test/locale/zh-hk.js
+++ b/src/test/locale/zh-hk.js
@@ -240,7 +240,7 @@ test('from', function (assert) {
 });
 
 test('suffix', function (assert) {
-    assert.equal(moment(30000).from(0), '幾秒內', 'prefix');
+    assert.equal(moment(30000).from(0), '幾秒後', 'prefix');
     assert.equal(moment(0).from(30000), '幾秒前', 'suffix');
 });
 
@@ -255,10 +255,10 @@ test('now from now', function (assert) {
 test('fromNow', function (assert) {
     assert.equal(
         moment().add({ s: 30 }).fromNow(),
-        '幾秒內',
+        '幾秒後',
         'in a few seconds'
     );
-    assert.equal(moment().add({ d: 5 }).fromNow(), '5 天內', 'in 5 days');
+    assert.equal(moment().add({ d: 5 }).fromNow(), '5 天後', 'in 5 days');
 });
 
 test('calendar day', function (assert) {
diff --git a/src/test/locale/zh-tw.js b/src/test/locale/zh-tw.js
index 785836e1c..5c3060764 100644
--- a/src/test/locale/zh-tw.js
+++ b/src/test/locale/zh-tw.js
@@ -240,7 +240,7 @@ test('from', function (assert) {
 });
 
 test('suffix', function (assert) {
-    assert.equal(moment(30000).from(0), '幾秒內', 'prefix');
+    assert.equal(moment(30000).from(0), '幾秒後', 'prefix');
     assert.equal(moment(0).from(30000), '幾秒前', 'suffix');
 });
 
@@ -255,10 +255,10 @@ test('now from now', function (assert) {
 test('fromNow', function (assert) {
     assert.equal(
         moment().add({ s: 30 }).fromNow(),
-        '幾秒內',
+        '幾秒後',
         'in a few seconds'
     );
-    assert.equal(moment().add({ d: 5 }).fromNow(), '5 天內', 'in 5 days');
+    assert.equal(moment().add({ d: 5 }).fromNow(), '5 天後', 'in 5 days');
 });
 
 test('calendar day', function (assert) {