From a1373e673c3409a2473b93d4205597beee6450f9 Mon Sep 17 00:00:00 2001 From: Vass Bence <49574140+vassbence@users.noreply.github.com> Date: Sun, 4 Oct 2020 20:13:08 +0200 Subject: [PATCH 1/4] Fix hungarian localization fixes #1111 --- src/locale/hu.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/locale/hu.js b/src/locale/hu.js index 116086da6..9e5d593a1 100644 --- a/src/locale/hu.js +++ b/src/locale/hu.js @@ -13,17 +13,17 @@ const locale = { relativeTime: { future: '%s múlva', past: '%s', - s: 'néhány másodperc', - m: 'egy perc', - mm: '%d perc', - h: 'egy óra', - hh: '%d óra', - d: 'egy nap', - dd: '%d nap', - M: 'egy hónap', - MM: '%d hónap', - y: 'egy éve', - yy: '%d év' + s: (_, __, ___, isFuture) => `néhány másodperc${isFuture ? "" : "e"}`, + m: (_, __, ___, isFuture) => `egy perc${isFuture ? "" : "e"}`, + mm: (n, __, ___, isFuture) => `${n} perc${isFuture ? "" : "e"}`, + h: (_, __, ___, isFuture) => `egy ${isFuture ? "óra" : "órája"}`, + hh: (n, __, ___, isFuture) => `${n} ${isFuture ? "óra" : "órája"}`, + d: (_, __, ___, isFuture) => `egy ${isFuture ? "nap" : "napja"}`, + dd: (n, __, ___, isFuture) => `${n} ${isFuture ? "nap" : "napja"}`, + M: (_, __, ___, isFuture) => `egy ${isFuture ? "hónap" : "hónapja"}`, + MM: (n, __, ___, isFuture) => `${n} ${isFuture ? "hónap" : "hónapja"}`, + y: (_, __, ___, isFuture) => `egy ${isFuture ? "év" : "éve"}`, + yy: (n, __, ___, isFuture) => `${n} ${isFuture ? "év" : "éve"}`, }, formats: { LT: 'H:mm', From fad3205ea3affba90eba7daf9850385df676a56e Mon Sep 17 00:00:00 2001 From: vassbence Date: Thu, 15 Oct 2020 17:15:02 +0200 Subject: [PATCH 2/4] fix eslint --- src/locale/hu.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/locale/hu.js b/src/locale/hu.js index 9e5d593a1..17c3f2432 100644 --- a/src/locale/hu.js +++ b/src/locale/hu.js @@ -13,17 +13,17 @@ const locale = { relativeTime: { future: '%s múlva', past: '%s', - s: (_, __, ___, isFuture) => `néhány másodperc${isFuture ? "" : "e"}`, - m: (_, __, ___, isFuture) => `egy perc${isFuture ? "" : "e"}`, - mm: (n, __, ___, isFuture) => `${n} perc${isFuture ? "" : "e"}`, - h: (_, __, ___, isFuture) => `egy ${isFuture ? "óra" : "órája"}`, - hh: (n, __, ___, isFuture) => `${n} ${isFuture ? "óra" : "órája"}`, - d: (_, __, ___, isFuture) => `egy ${isFuture ? "nap" : "napja"}`, - dd: (n, __, ___, isFuture) => `${n} ${isFuture ? "nap" : "napja"}`, - M: (_, __, ___, isFuture) => `egy ${isFuture ? "hónap" : "hónapja"}`, - MM: (n, __, ___, isFuture) => `${n} ${isFuture ? "hónap" : "hónapja"}`, - y: (_, __, ___, isFuture) => `egy ${isFuture ? "év" : "éve"}`, - yy: (n, __, ___, isFuture) => `${n} ${isFuture ? "év" : "éve"}`, + s: (_, __, ___, isFuture) => `néhány másodperc${isFuture ? '' : 'e'}`, + m: (_, __, ___, isFuture) => `egy perc${isFuture ? '' : 'e'}`, + mm: (n, __, ___, isFuture) => `${n} perc${isFuture ? '' : 'e'}`, + h: (_, __, ___, isFuture) => `egy ${isFuture ? 'óra' : 'órája'}`, + hh: (n, __, ___, isFuture) => `${n} ${isFuture ? 'óra' : 'órája'}`, + d: (_, __, ___, isFuture) => `egy ${isFuture ? 'nap' : 'napja'}`, + dd: (n, __, ___, isFuture) => `${n} ${isFuture ? 'nap' : 'napja'}`, + M: (_, __, ___, isFuture) => `egy ${isFuture ? 'hónap' : 'hónapja'}`, + MM: (n, __, ___, isFuture) => `${n} ${isFuture ? 'hónap' : 'hónapja'}`, + y: (_, __, ___, isFuture) => `egy ${isFuture ? 'év' : 'éve'}`, + yy: (n, __, ___, isFuture) => `${n} ${isFuture ? 'év' : 'éve'}` }, formats: { LT: 'H:mm', From b908fc1f9a709fb1531ccd46bdebc8c2dbceec42 Mon Sep 17 00:00:00 2001 From: vassbence Date: Thu, 15 Oct 2020 17:44:58 +0200 Subject: [PATCH 3/4] add tests for hungarian localization --- src/locale/hu.js | 23 ++++++++++---------- test/locale/hu.test.js | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 test/locale/hu.test.js diff --git a/src/locale/hu.js b/src/locale/hu.js index 17c3f2432..92df6992f 100644 --- a/src/locale/hu.js +++ b/src/locale/hu.js @@ -13,17 +13,17 @@ const locale = { relativeTime: { future: '%s múlva', past: '%s', - s: (_, __, ___, isFuture) => `néhány másodperc${isFuture ? '' : 'e'}`, - m: (_, __, ___, isFuture) => `egy perc${isFuture ? '' : 'e'}`, - mm: (n, __, ___, isFuture) => `${n} perc${isFuture ? '' : 'e'}`, - h: (_, __, ___, isFuture) => `egy ${isFuture ? 'óra' : 'órája'}`, - hh: (n, __, ___, isFuture) => `${n} ${isFuture ? 'óra' : 'órája'}`, - d: (_, __, ___, isFuture) => `egy ${isFuture ? 'nap' : 'napja'}`, - dd: (n, __, ___, isFuture) => `${n} ${isFuture ? 'nap' : 'napja'}`, - M: (_, __, ___, isFuture) => `egy ${isFuture ? 'hónap' : 'hónapja'}`, - MM: (n, __, ___, isFuture) => `${n} ${isFuture ? 'hónap' : 'hónapja'}`, - y: (_, __, ___, isFuture) => `egy ${isFuture ? 'év' : 'éve'}`, - yy: (n, __, ___, isFuture) => `${n} ${isFuture ? 'év' : 'éve'}` + s: (_, s, ___, isFuture) => `néhány másodperc${isFuture || s ? '' : 'e'}`, + m: (_, s, ___, isFuture) => `egy perc${isFuture || s ? '' : 'e'}`, + mm: (n, s, ___, isFuture) => `${n} perc${isFuture || s ? '' : 'e'}`, + h: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'óra' : 'órája'}`, + hh: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'óra' : 'órája'}`, + d: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'nap' : 'napja'}`, + dd: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'nap' : 'napja'}`, + M: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'hónap' : 'hónapja'}`, + MM: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'hónap' : 'hónapja'}`, + y: (_, s, ___, isFuture) => `egy ${isFuture || s ? 'év' : 'éve'}`, + yy: (n, s, ___, isFuture) => `${n} ${isFuture || s ? 'év' : 'éve'}` }, formats: { LT: 'H:mm', @@ -38,4 +38,3 @@ const locale = { dayjs.locale(locale, null, true) export default locale - diff --git a/test/locale/hu.test.js b/test/locale/hu.test.js new file mode 100644 index 000000000..5ee5ac272 --- /dev/null +++ b/test/locale/hu.test.js @@ -0,0 +1,48 @@ +import moment from 'moment' +import dayjs from '../../src' +import relativeTime from '../../src/plugin/relativeTime' +import '../../src/locale/hu' + +dayjs.extend(relativeTime) + +it('RelativeTime: Time from X', () => { + const T = [ + // [44.4, 'second'], // a few seconds + // [89.5, 'second'], // a minute + [2, 'minute'], // 2 minutes + [43, 'minute'], // 43 minutes + [45, 'minute'], // an hour + [3, 'hour'], // 3 hours + [21, 'hour'], // 21 hours + [1, 'day'], // a day + [3, 'day'], // 3 day + [25, 'day'], // 25 days + [1, 'month'], // a month + [2, 'month'], // 2 month + [10, 'month'], // 10 month + [1, 'year'], // a year + [2, 'year'], // 2 year + [5, 'year'], // 5 year + [18, 'month'] // 2 years + ] + + T.forEach((t) => { + dayjs.locale('hu') + moment.locale('hu') + + const dayjsDay = dayjs() + const momentDay = moment() + + const dayjsCompare = dayjs().add(t[0], t[1]) + const momentCompare = moment().add(t[0], t[1]) + + expect(dayjsDay.from(dayjsCompare)) + .toBe(momentDay.from(momentCompare)) + + expect(dayjsDay.to(dayjsCompare)) + .toBe(momentDay.to(momentCompare)) + + expect(dayjsDay.from(dayjsCompare, true)) + .toBe(momentDay.from(momentCompare, true)) + }) +}) From d634b100752f7acb9f8f8edff8af99d3940a608e Mon Sep 17 00:00:00 2001 From: vassbence Date: Thu, 15 Oct 2020 17:45:50 +0200 Subject: [PATCH 4/4] fix comment --- test/locale/hu.test.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/locale/hu.test.js b/test/locale/hu.test.js index 5ee5ac272..0a9cee20d 100644 --- a/test/locale/hu.test.js +++ b/test/locale/hu.test.js @@ -7,8 +7,8 @@ dayjs.extend(relativeTime) it('RelativeTime: Time from X', () => { const T = [ - // [44.4, 'second'], // a few seconds - // [89.5, 'second'], // a minute + [44.4, 'second'], // a few seconds + [89.5, 'second'], // a minute [2, 'minute'], // 2 minutes [43, 'minute'], // 43 minutes [45, 'minute'], // an hour @@ -36,13 +36,10 @@ it('RelativeTime: Time from X', () => { const dayjsCompare = dayjs().add(t[0], t[1]) const momentCompare = moment().add(t[0], t[1]) - expect(dayjsDay.from(dayjsCompare)) - .toBe(momentDay.from(momentCompare)) + expect(dayjsDay.from(dayjsCompare)).toBe(momentDay.from(momentCompare)) - expect(dayjsDay.to(dayjsCompare)) - .toBe(momentDay.to(momentCompare)) + expect(dayjsDay.to(dayjsCompare)).toBe(momentDay.to(momentCompare)) - expect(dayjsDay.from(dayjsCompare, true)) - .toBe(momentDay.from(momentCompare, true)) + expect(dayjsDay.from(dayjsCompare, true)).toBe(momentDay.from(momentCompare, true)) }) })