From 19f6da3caec355f39b21a11dfb60b79bdc064fff Mon Sep 17 00:00:00 2001 From: suomiy Date: Thu, 9 Jan 2020 14:39:13 +0100 Subject: [PATCH] shared: make separator optional in joinGrammaticallyListOfItems --- frontend/packages/console-shared/src/utils/grammar.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/packages/console-shared/src/utils/grammar.ts b/frontend/packages/console-shared/src/utils/grammar.ts index e46a015954d..cddbff9e56d 100644 --- a/frontend/packages/console-shared/src/utils/grammar.ts +++ b/frontend/packages/console-shared/src/utils/grammar.ts @@ -1,11 +1,11 @@ import * as _ from 'lodash'; -export const joinGrammaticallyListOfItems = (items: string[]) => { +export const joinGrammaticallyListOfItems = (items: string[], separator = 'and') => { const result = items.join(', '); const lastCommaIdx = result.lastIndexOf(','); return items.length > 1 && lastCommaIdx >= 0 - ? `${result.substr(0, lastCommaIdx)} and${result.substr(lastCommaIdx + 1)}` + ? `${result.substr(0, lastCommaIdx)} ${separator}${result.substr(lastCommaIdx + 1)}` : result; };