Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated 0 board to 0 boards (singular vs plural) #1210

Merged
merged 13 commits into from
Sep 22, 2021
Merged

Updated 0 board to 0 boards (singular vs plural) #1210

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c8dc19
Updated 0 board to 0 boards (singular vs plural
harshilsharma63 Sep 15, 2021
05438e1
Made text translatable
harshilsharma63 Sep 15, 2021
477d644
Merge branch 'main' into 0-boards
harshilsharma63 Sep 15, 2021
f8cf455
Used better i18n for singular-plural
harshilsharma63 Sep 16, 2021
ecf3ebe
Merge branch '0-boards' of github.com:mattermost/focalboard into 0-bo…
harshilsharma63 Sep 16, 2021
3bb7293
Updated tests
harshilsharma63 Sep 16, 2021
2b292b0
Minor fixes
harshilsharma63 Sep 16, 2021
4bfdb02
Merge branch 'main' into 0-boards
harshilsharma63 Sep 16, 2021
a832b73
done
harshilsharma63 Sep 16, 2021
e179fc3
Lint fix
harshilsharma63 Sep 16, 2021
dfa3837
Merge branch 'main' into 0-boards
harshilsharma63 Sep 20, 2021
aa8fcad
Merge branch 'main' into 0-boards
harshilsharma63 Sep 22, 2021
0cd19ba
Updated tests
harshilsharma63 Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions webapp/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
"GalleryCard.delete": "Delete",
"GalleryCard.duplicate": "Duplicate",
"GroupBy.ungroup": "Ungroup",
"General.BoardSingular": "Board",
"General.BoardPlural": "Boards",
"KanbanCard.delete": "Delete",
"KanbanCard.duplicate": "Duplicate",
"KanbanCard.untitled": "Untitled",
Expand Down
6 changes: 5 additions & 1 deletion webapp/src/components/workspaceSwitcher/workspaceOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ const WorkspaceOptions = (props: Props): JSX.Element => {

const Option = (props: any): JSX.Element => {
const {innerProps, innerRef} = props
const intl = useIntl()

const singular = intl.formatMessage({id: 'General.BoardSingular', defaultMessage: 'Board'})
const plural = intl.formatMessage({id: 'General.BoardPlural', defaultMessage: 'Boards'})

return (
<div
Expand All @@ -102,7 +106,7 @@ const Option = (props: any): JSX.Element => {
{
props.data.value !== DashboardOption.value &&
<div className='boardCount'>
{props.data.boardCount} {props.data.boardCount > 1 ? 'Boards' : 'Board'}
{props.data.boardCount} {props.data.boardCount === 1 ? singular : plural}
</div>
}

Expand Down