People.Client: DeleteProfileEverDialog: applied real custom names

This commit is contained in:
Daniil Senkiv 2020-01-21 18:17:41 +03:00
parent bfc06bb1f3
commit fe9131eed3
3 changed files with 11 additions and 6 deletions

View File

@ -11,7 +11,6 @@ import {
import { withTranslation, Trans } from "react-i18next";
import i18n from "./i18n";
import { api, utils } from "asc-web-common";
import { typeUser } from "../../../helpers/customNames";
import { fetchPeople } from '../../../store/people/actions';
import ModalDialogContainer from '../ModalDialogContainer';
const { deleteUser } = api.people;
@ -50,7 +49,7 @@ class DeleteProfileEverDialogComponent extends React.Component {
render() {
console.log("DeleteProfileEverDialog render");
const { t, visible, user, onClose } = this.props;
const { t, visible, user, onClose, userCaption } = this.props;
const { isRequestRunning } = this.state;
return (
@ -63,7 +62,7 @@ class DeleteProfileEverDialogComponent extends React.Component {
<>
<Text>
<Trans i18nKey='DeleteUserConfirmation' i18n={i18n}>
{{ typeUser }} <strong>{{ user: user.displayName }}</strong> will be deleted.
{{ userCaption }} <strong>{{ user: user.displayName }}</strong> will be deleted.
</Trans>
</Text>
<Text>{t('NotBeUndone')}</Text>
@ -117,4 +116,10 @@ DeleteProfileEverDialog.propTypes = {
history: PropTypes.object.isRequired
};
export default connect(null, { fetchPeople })(withRouter(DeleteProfileEverDialog));
function mapStateToProps(state) {
return {
userCaption: state.auth.settings.customNames.userCaption
};
}
export default connect(mapStateToProps, { fetchPeople })(withRouter(DeleteProfileEverDialog));

View File

@ -1,6 +1,6 @@
{
"Confirmation": "Confirmation",
"DeleteUserConfirmation": "{{typeUser}} <strong>{{user}}</strong> will be deleted.",
"DeleteUserConfirmation": "{{userCaption}} <strong>{{user}}</strong> will be deleted.",
"NotBeUndone": "Note: this action cannot be undone.",
"DeleteUserDataConfirmation": "User's personal documents that are available to others will be deleted. To avoid this, you must start the data reassign process before deleting.",
"OKButton": "OK",

View File

@ -1,6 +1,6 @@
{
"Confirmation": "Подтверждение",
"DeleteUserConfirmation": "{{typeUser}} <strong>{{user}}</strong> будет удален.",
"DeleteUserConfirmation": "{{userCaption}} <strong>{{user}}</strong> будет удален.",
"NotBeUndone": "Внимание: это действие необратимо.",
"DeleteUserDataConfirmation": "Будут удалены личные документы пользователя, доступные для других. Чтобы избежать этого, нужно перед удалением запустить процесс передачи данных.",
"OKButton": "OK",