summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-05-09 16:00:40 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-05-09 16:00:40 -0400
commit0c701cc1d02c3d3b630050a0547f9dc632596013 (patch)
treeb26324ebe2457d5cc8f8547513c053add166fc3c /webapp/components/user_settings
parente52ab9737ed4043b5c6236561939d50a8588b349 (diff)
downloadchat-0c701cc1d02c3d3b630050a0547f9dc632596013.tar.gz
chat-0c701cc1d02c3d3b630050a0547f9dc632596013.tar.bz2
chat-0c701cc1d02c3d3b630050a0547f9dc632596013.zip
PLT-6518 Fixed user's locale not being loaded with redux actions (#6359)
* Stopped ManageLanguages component from mutating user * Removed obsolete reference to mm_user * PLT-6518 Fixed user's locale not being loaded with redux actions
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/manage_languages.jsx10
1 files changed, 4 insertions, 6 deletions
diff --git a/webapp/components/user_settings/manage_languages.jsx b/webapp/components/user_settings/manage_languages.jsx
index b88485110..09b32e1d7 100644
--- a/webapp/components/user_settings/manage_languages.jsx
+++ b/webapp/components/user_settings/manage_languages.jsx
@@ -33,12 +33,10 @@ export default class ManageLanguage extends React.Component {
changeLanguage(e) {
e.preventDefault();
- var user = this.props.user;
- var locale = this.state.locale;
-
- user.locale = locale;
-
- this.submitUser(user);
+ this.submitUser({
+ ...this.props.user,
+ locale: this.state.locale
+ });
}
submitUser(user) {
updateUser(user, Constants.UserUpdateEvents.LANGUAGE,