IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web: People: Changed language state mapping

Browse Source
This commit is contained in:
Alexey Safronov 2019-09-29 15:29:19 +03:00
parent e0578eb7d4
commit 1e7d1610fc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
products/ASC.People/Client/src/components/pages/Profile/index.js
View File

@ -73,10 +73,9 @@ class PureProfile extends React.Component {
const ProfileContainer = withTranslation()(PureProfile);
const Profile = (props) => {
const { profile } = props;
const lng = (profile && profile.cultureName) || "en";
const { language } = props;
i18n.changeLanguage(lng);
i18n.changeLanguage(language);
return <I18nextProvider i18n={i18n}><ProfileContainer {...props} /></I18nextProvider>
};
@ -91,7 +90,8 @@ Profile.propTypes = {
function mapStateToProps(state) {
return {
profile: state.profile.targetUser
profile: state.profile.targetUser,
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}

8
products/ASC.People/Client/src/components/pages/ProfileAction/index.js
View File

@ -33,11 +33,10 @@ class ProfileAction extends React.Component {
console.log("ProfileAction render")
let loaded = false;
const { profile, match } = this.props;
const { profile, match, language } = this.props;
const { userId, type } = match.params;
const lng = (profile && profile.cultureName) || "en";
i18n.changeLanguage(lng);
i18n.changeLanguage(language);
if (type) {
loaded = true;
@ -74,7 +73,8 @@ ProfileAction.propTypes = {
function mapStateToProps(state) {
return {
profile: state.profile.targetUser
profile: state.profile.targetUser,
language: state.auth.user.cultureName || state.auth.settings.culture,
};
}