diff --git a/products/ASC.People/Client/src/components/customNames.js b/products/ASC.People/Client/src/components/customNames.js new file mode 100644 index 0000000000..ab4d5f8edd --- /dev/null +++ b/products/ASC.People/Client/src/components/customNames.js @@ -0,0 +1,3 @@ +export const departmentsName = 'Departments'; +export const position = 'Position'; +export const employedSinceDate = 'Employed since'; \ No newline at end of file diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js index de811940d9..730196ef76 100644 --- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js +++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js @@ -5,6 +5,7 @@ import { Avatar, Button, Textarea, Text, toastr } from 'asc-web-components' import { withTranslation } from 'react-i18next'; import { toEmployeeWrapper, getUserRole, profileEqual, createProfile } from '../../../../../store/profile/actions'; import { MainContainer, AvatarContainer, MainFieldsContainer, TextField, PasswordField, DateField, RadioField, DepartmentField } from './userFormFields' +import { departmentsName, position, employedSinceDate } from '../../../../customNames'; class CreateUserForm extends React.Component { @@ -177,7 +178,7 @@ class CreateUserForm extends React.Component { radioOnChange={this.onTextChange} /> diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js index 5a91147cf9..30b95dd306 100644 --- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js +++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js @@ -5,6 +5,7 @@ import { Avatar, Button, Textarea, Text, toastr } from 'asc-web-components' import { withTranslation } from 'react-i18next'; import { toEmployeeWrapper, getUserRole, profileEqual, updateProfile } from '../../../../../store/profile/actions'; import { MainContainer, AvatarContainer, MainFieldsContainer, TextField, PasswordField, DateField, RadioField, DepartmentField } from './userFormFields' +import { departmentsName, position, employedSinceDate } from '../../../../customNames'; class UpdateUserForm extends React.Component { @@ -179,7 +180,7 @@ class UpdateUserForm extends React.Component { radioOnChange={this.onTextChange} /> diff --git a/products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json b/products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json index 1190276c9d..10f2ab7b8f 100644 --- a/products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json +++ b/products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json @@ -20,7 +20,7 @@ "NewEmployee": "New employee", "NewGuest": "New guest", - "EmployedSinceDate": "EmployedSinceDate", - "Position": "Position", - "Departments": "Departments" + "CustomEmployedSinceDate": "{{employedSinceDate}}", + "CustomPosition": "{{position}}", + "CustomDepartmentsName": "{{departmentsName}}" } \ No newline at end of file diff --git a/products/ASC.People/Client/src/resourceConfig.json b/products/ASC.People/Client/src/resourceConfig.json index b50b9f3b60..9f0c94aea1 100644 --- a/products/ASC.People/Client/src/resourceConfig.json +++ b/products/ASC.People/Client/src/resourceConfig.json @@ -1,55 +1,76 @@ { - "Article" : - { - - }, - "pages": - { - "Profile" : - { - "Resource.UserType" : "UserType", - "Resource.Email" : "Email", - "Resource.Sex" : "Sex", - "Resource.Birthdate" : "Birthdate", - "Resource.Location" : "Location", - "Resource.Language" : "Language", - "Resource.EditUserDialogTitle" : "EditUserDialogTitle", - "Resource.Subscriptions" : "Subscriptions", - "Resource.Comments" : "Comments", - "Resource.ContactInformation" : "ContactInformation", - "Resource.SocialProfiles" : "SocialProfiles", - "Resource.PendingTitle" : "PendingTitle", - "Resource.EmailChangeButton" : "EmailChangeButton", - "Resource.SendInviteAgain" : "SendInviteAgain", - "Resource.EditPhoto" : "EditPhoto", - "Resource.PasswordChangeButton" : "PasswordChangeButton", - "Resource.DisableUserButton" : "DisableUserButton", - "Resource.EnableUserButton" : "EnableUserButton", - "Resource.ReassignData" : "ReassignData", - "Resource.RemoveData" : "RemoveData", - "Resource.DeleteSelfProfile" : "DeleteSelfProfile", - "Resource.EditButton" : "EditButton", - "Resource.Actions" : "Actions" + "Article": {}, + "pages": { + "Profile": { + "Resource": [ + "UserType", + "Email", + "Sex", + "Birthdate", + "Location", + "Language", + "EditUserDialogTitle", + "Subscriptions", + "Comments", + "ContactInformation", + "SocialProfiles", + "PendingTitle", + "EmailChangeButton", + "SendInviteAgain", + "EditPhoto", + "PasswordChangeButton", + "DisableUserButton", + "EnableUserButton", + "ReassignData", + "RemoveData", + "DeleteSelfProfile", + "EditButton", + "Actions" + ] }, "ProfileAction": { - "Resource.EditPhoto" : "EditPhoto", - "Resource.FirstName" : "FirstName", - "Resource.LastName" : "LastName", - "Resource.Email" : "Email", - "Resource.Password" : "Password", - "Resource.Birthdate" : "Birthdate", - "Resource.Sex" : "Sex", - "Resource.Location" : "Location", - "Resource.Comments" : "Comments", - "Resource.SaveButton" : "SaveButton", - "Resource.CancelButton" : "CancelButton" - + "Resource": [ + "EditPhoto", + "FirstName", + "LastName", + "Email", + "Password", + "Birthdate", + "Sex", + "Location", + "Comments", + "SaveButton", + "CancelButton" + ] + }, + "Home": { + "Resource": [ + "LoadingProcessing", + "LoadingDescription", + "PasswordChangeButton", + "EditButton", + "DisableUserButton", + "ReassignData", + "RemoveData", + "DeleteSelfProfile", + "EditButton", + "EnableUserButton" + ], + "PeopleResource": [ + "LblSendEmail", + "LblSendMessage", + "NotFoundDescription", + "NotFoundTitle", + "ClearButton", + "LblChangeEmail" + ] } - }, - "Layout": - { - "Resource.Profile" : "Profile", - "Resource.AboutCompanyTitle" : "AboutCompanyTitle", - "Resource.LogoutButton" : "LogoutButton" - } + }, + "Layout": { + "Resource": [ + "Profile", + "AboutCompanyTitle", + "LogoutButton" + ] + } } \ No newline at end of file