People.Client: GroupAction: applied real custom names

products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js

@@ -15,11 +15,6 @@ import {
   resetGroup,
   updateGroup
 } from "../../../../../store/group/actions";
-import {
-  department,
-  headOfDepartment,
-  typeUser
-} from "../../../../../helpers/customNames";
 
 import { GUID_EMPTY } from "../../../../../helpers/constants";
 import PropTypes from "prop-types";
@@ -86,7 +81,7 @@ class SectionBodyContent extends React.Component {
   }
 
   mapPropsToState = () => {
-    const { group, users, groups, t } = this.props;
+    const { group, users, groups, t, userCaption } = this.props;
 
     const newState = {
       id: group ? group.id : "",
@@ -105,7 +100,7 @@ class SectionBodyContent extends React.Component {
           }
         : {
             key: 0,
-            label: t("CustomAddEmployee", { typeUser })
+            label: t("CustomAddEmployee", { typeUser: userCaption })
           },
       groupMembers:
         group && group.members
@@ -124,7 +119,7 @@ class SectionBodyContent extends React.Component {
             }
           : {
               key: GUID_EMPTY,
-              label: t("CustomAddEmployee", { typeUser }),
+              label: t("CustomAddEmployee", { typeUser: userCaption }),
               default: true
             }
     };
@@ -255,7 +250,7 @@ class SectionBodyContent extends React.Component {
   }
 
   render() {
-    const { t } = this.props;
+    const { t, groupCaption, groupHeadCaption } = this.props;
     const {
       groupName,
       groupMembers,
@@ -273,7 +268,7 @@ class SectionBodyContent extends React.Component {
           isRequired={true}
           hasError={false}
           isVertical={true}
-          labelText={t("CustomDepartmentName", { department })}
+          labelText={t("CustomDepartmentName", { groupCaption })}
         >
           <TextInput
             id="group-name"
@@ -293,7 +288,7 @@ class SectionBodyContent extends React.Component {
           isRequired={false}
           hasError={false}
           isVertical={true}
-          labelText={t("CustomHeadOfDepartment", { headOfDepartment })}
+          labelText={groupHeadCaption}
         >
           <ComboBox
             id="head-selector_button"
@@ -435,7 +430,10 @@ function mapStateToProps(state) {
     settings: state.auth.settings,
     group: state.group.targetGroup,
     groups: convertGroups(state.people.groups),
-    users: convertUsers(state.people.selector.users) //TODO: replace to api requests with search
+    users: convertUsers(state.people.selector.users), //TODO: replace to api requests with search
+    groupCaption: state.auth.settings.customNames.groupCaption,
+    groupHeadCaption: state.auth.settings.customNames.groupHeadCaption,
+    userCaption: state.auth.settings.customNames.userCaption
   };
 }
 

products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js

@@ -5,7 +5,6 @@ import PropTypes from "prop-types";
 import { IconButton, utils } from "asc-web-components";
 import { Headline } from "asc-web-common";
 import { withTranslation } from "react-i18next";
-import { department } from "./../../../../../helpers/customNames";
 import { resetGroup } from "../../../../../store/group/actions";
 import styled from "styled-components";
 
@@ -39,10 +38,10 @@ class SectionHeaderContent extends React.Component {
   };
 
   render() {
-    const { group, t } = this.props;
+    const { group, t, groupCaption } = this.props;
     const headerText = group
-      ? t("CustomEditDepartment", { department })
-      : t("CustomNewDepartment", { department });
+      ? t("CustomEditDepartment", { groupCaption })
+      : t("CustomNewDepartment", { groupCaption });
     return (
       <Wrapper>
         <IconButton
@@ -74,7 +73,8 @@ SectionHeaderContent.defaultProps = {
 function mapStateToProps(state) {
   return {
     settings: state.auth.settings,
-    group: state.group.targetGroup
+    group: state.group.targetGroup,
+    groupCaption: state.auth.settings.customNames.groupCaption
   };
 }
 

products/ASC.People/Client/src/components/pages/GroupAction/locales/en/translation.json

@@ -2,13 +2,10 @@
   "SaveButton": "Save",
   "CancelButton": "Cancel",
 
-
-
-  "CustomHeadOfDepartment": "{{headOfDepartment}}",
   "CustomAddEmployee": "Add {{typeUser, lowercase}}",
-  "CustomNewDepartment": "New {{department, lowercase}}",
-  "CustomEditDepartment": "Edit {{department, lowercase}}",
-  "CustomDepartmentName": "{{department}} name",
+  "CustomNewDepartment": "New {{groupCaption, lowercase}}",
+  "CustomEditDepartment": "Edit {{groupCaption, lowercase}}",
+  "CustomDepartmentName": "{{groupCaption}} name",
   "Members": "Members",
   "AddMembers": "Add members",
   "SearchAddedMembers": "Search added members"

products/ASC.People/Client/src/components/pages/GroupAction/locales/ru/translation.json

@@ -2,13 +2,10 @@
   "SaveButton": "Сохранить",
   "CancelButton": "Отмена",
 
-
-
-  "CustomHeadOfDepartment": "{{headOfDepartment}}",
   "CustomAddEmployee": "Добавить {{typeUser, lowercase}}",
-  "CustomNewDepartment": "Новый {{department, lowercase}}",
-  "CustomEditDepartment": "Редактирование {{department, lowercase}}",
-  "CustomDepartmentName": "Имя {{department}}",
+  "CustomNewDepartment": "Новая {{groupCaption, lowercase}}",
+  "CustomEditDepartment": "Редактирование {{groupCaption, lowercase}}",
+  "CustomDepartmentName": "Имя {{groupCaption}}",
   "Members": "Участники",
   "AddMembers": "Добавить участников",
   "SearchAddedMembers": "Поиск добавленных участников"