From 2e5f48a192af6489c0a52fcd50302b02c51bab31 Mon Sep 17 00:00:00 2001 From: atscott Date: Mon, 7 May 2018 14:32:24 -0700 Subject: [PATCH] Update future relative time for Italian --- src/locale/it.js | 4 +--- src/test/locale/it.js | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/locale/it.js b/src/locale/it.js index a7ce1173eb..4eef70193e 100644 --- a/src/locale/it.js +++ b/src/locale/it.js @@ -35,9 +35,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 0817a2f756..a377c9dbf2 100644 --- a/src/test/locale/it.js +++ b/src/test/locale/it.js @@ -138,12 +138,12 @@ 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'); + assert.equal(moment().add({s: 30}).fromNow(), 'tra alcuni secondi', 'in seconds'); assert.equal(moment().add({d: 5}).fromNow(), 'tra 5 giorni', 'in 5 days'); });