Merge pull request #441 from keen/fix/relative-time-list

fix: 🐛 relative time list and typos
keen · Oct 5, 2020 · 29e90c7 · 29e90c7
2 parents 57503bb + 77bc4f8
commit 29e90c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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',
 };