From 77bc4f8304d1758a9c9060ca0e04d537baa84abb Mon Sep 17 00:00:00 2001 From: Artur Pryka Date: Mon, 5 Oct 2020 13:55:31 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20relative=20time=20list=20?= =?UTF-8?q?and=20typos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RelativeTimeLabel/RelativeTimeLabel.test.tsx | 2 +- .../app/queryCreator/components/RelativeTimeLabel/text.json | 2 +- lib/js/app/queryCreator/constants.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/js/app/queryCreator/components/RelativeTimeLabel/RelativeTimeLabel.test.tsx b/lib/js/app/queryCreator/components/RelativeTimeLabel/RelativeTimeLabel.test.tsx index a19e33225..dc3f3c883 100644 --- a/lib/js/app/queryCreator/components/RelativeTimeLabel/RelativeTimeLabel.test.tsx +++ b/lib/js/app/queryCreator/components/RelativeTimeLabel/RelativeTimeLabel.test.tsx @@ -33,7 +33,7 @@ test('shows message about including current interval in timeframe', () => { wrapper: { getByText }, } = render({ units: 'years' }); - expect(getByText('(Include current year)')).toBeInTheDocument(); + expect(getByText('(Includes current year)')).toBeInTheDocument(); }); test('shows timeframe settings', () => { diff --git a/lib/js/app/queryCreator/components/RelativeTimeLabel/text.json b/lib/js/app/queryCreator/components/RelativeTimeLabel/text.json index 5f025123b..ddcb83cd7 100644 --- a/lib/js/app/queryCreator/components/RelativeTimeLabel/text.json +++ b/lib/js/app/queryCreator/components/RelativeTimeLabel/text.json @@ -1,5 +1,5 @@ { "label": "Last", "todayIncludes": "(Includes today)", - "relativityTitle": "Include current" + "relativityTitle": "Includes current" } diff --git a/lib/js/app/queryCreator/constants.ts b/lib/js/app/queryCreator/constants.ts index 1ec0abd9d..89536bdd7 100644 --- a/lib/js/app/queryCreator/constants.ts +++ b/lib/js/app/queryCreator/constants.ts @@ -47,9 +47,9 @@ export const ANALYSIS_TYPES: Analysis[] = [ export const TIME_UNITS = { minute: 'minutes', - month: 'months', hour: 'hours', - year: 'years', - week: 'weeks', day: 'days', + week: 'weeks', + month: 'months', + year: 'years', };