From 194e64daff528b1661ba3eb4ac723fa01ae7674b Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Wed, 17 Jun 2020 19:09:00 -0700 Subject: [PATCH] [locale] it: Improve future relative time (#4617) --- src/locale/it.js | 4 +--- src/test/locale/it.js | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/locale/it.js b/src/locale/it.js index dc1e7580f9..a52dc98e6a 100644 --- a/src/locale/it.js +++ b/src/locale/it.js @@ -80,9 +80,7 @@ export default moment.defineLocale('it', { sameElse: 'L', }, relativeTime: { - future: function (s) { - return (/^[0-9].+$/.test(s) ? 'tra' : 'in') + ' ' + s; - }, + future: 'tra %s', past: '%s fa', s: 'alcuni secondi', ss: '%d secondi', diff --git a/src/test/locale/it.js b/src/test/locale/it.js index aa45ce08d2..3c84d3869d 100644 --- a/src/test/locale/it.js +++ b/src/test/locale/it.js @@ -289,15 +289,15 @@ test('from', function (assert) { }); test('suffix', function (assert) { - assert.equal(moment(30000).from(0), 'in alcuni secondi', 'prefix'); + assert.equal(moment(30000).from(0), 'tra alcuni secondi', 'prefix'); assert.equal(moment(0).from(30000), 'alcuni secondi fa', 'suffix'); }); test('fromNow', function (assert) { assert.equal( moment().add({ s: 30 }).fromNow(), - 'in alcuni secondi', - 'in seconds' + 'tra alcuni secondi', + 'tra seconds' ); assert.equal(moment().add({ d: 5 }).fromNow(), 'tra 5 giorni', 'in 5 days'); });