diff --git a/src/pages/Organizations/components/OrganizationAccessList.jsx b/src/pages/Organizations/components/OrganizationAccessList.jsx index 09034eb111..c30c31943c 100644 --- a/src/pages/Organizations/components/OrganizationAccessList.jsx +++ b/src/pages/Organizations/components/OrganizationAccessList.jsx @@ -355,8 +355,8 @@ class OrganizationAccessList extends React.Component { isOpen={showWarning} onClose={this.hideWarning} actions={[ - , - + , + ]} > {warningMsg} diff --git a/src/pages/Organizations/screens/OrganizationsList.jsx b/src/pages/Organizations/screens/OrganizationsList.jsx index 96bf1e83ee..a3746ebaab 100644 --- a/src/pages/Organizations/screens/OrganizationsList.jsx +++ b/src/pages/Organizations/screens/OrganizationsList.jsx @@ -153,7 +153,7 @@ class OrganizationsList extends Component { handleOpenOrgDeleteModal () { const { results, selected } = this.state; - const warningTitle = i18nMark(`Delete Organization${selected.length > 1 ? 's' : ''}`); + const warningTitle = selected.length > 1 ? i18nMark('Delete Organization') : i18nMark('Delete Organizations'); const warningMsg = i18nMark('Are you sure you want to delete:'); const orgsToDelete = []; @@ -271,60 +271,60 @@ class OrganizationsList extends Component { } = this.state; const { match } = this.props; return ( - - - { isModalOpen && ( - Delete, - - ]} - > - {warningMsg} -
- {orgsToDelete.map((org) => ( - - - {org.name} - + + {({ i18n }) => ( + + + { isModalOpen && ( + {i18n._(t`Delete`)}, + + ]} + > + {warningMsg}
-
- ))} -
-
- )} - {noInitialResults && ( - - - - <Trans>No Organizations Found</Trans> - - - Please add an organization to populate this list - - - ) || ( - - - - {({ i18n }) => ( + {orgsToDelete.map((org) => ( + + + {org.name} + +
+
+ ))} +
+ + )} + {noInitialResults && ( + + + + <Trans>No Organizations Found</Trans> + + + Please add an organization to populate this list + + + ) || ( + +
    { results.map(o => ( ))}
- )} -
- - { loading ?
loading...
: '' } - { error ?
error
: '' } -
- )} -
-
+ + { loading ?
loading...
: '' } + { error ?
error
: '' } + + )} + + + )} + ); } }