diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-18 11:37:03 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-18 11:37:03 -0400 |
| commit | 63273d6c164990f596ba72d87b1d566378a099f6 (patch) | |
| tree | eda3d8337d3701c43c00ea3f87fd8c83bd8f4e1f | |
| parent | 5b824cb8552f5dd81d7c1d7800b808d4defc17ad (diff) | |
| parent | 5a4945c4d5c06b96b4f6d5cb38bcef6f949dff16 (diff) | |
| download | chat-63273d6c164990f596ba72d87b1d566378a099f6.tar.gz chat-63273d6c164990f596ba72d87b1d566378a099f6.tar.bz2 chat-63273d6c164990f596ba72d87b1d566378a099f6.zip | |
Merge pull request #2471 from ZBoxApp/PLT-2368
PLT-2368: Fix for Date of last profile picture update is showing [obj…
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index 42c7e1a77..2129847aa 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -60,10 +60,6 @@ const holders = defineMessages({ id: 'user.settings.general.uploadImage', defaultMessage: "Click 'Edit' to upload an image." }, - imageUpdated: { - id: 'user.settings.general.imageUpdated', - defaultMessage: 'Image last updated {date}' - }, fullName: { id: 'user.settings.general.fullName', defaultMessage: 'Full Name' @@ -730,16 +726,22 @@ class UserSettingsGeneralTab extends React.Component { } else { let minMessage = formatMessage(holders.uploadImage); if (user.last_picture_update) { - minMessage = formatMessage(holders.imageUpdated, { - date: ( - <FormattedDate - value={new Date(user.last_picture_update)} - day='2-digit' - month='short' - year='numeric' - /> - ) - }); + minMessage = ( + <FormattedMessage + id='user.settings.general.imageUpdated' + defaultMessage='Image last updated {date}' + values={{ + date: ( + <FormattedDate + value={new Date(user.last_picture_update)} + day='2-digit' + month='short' + year='numeric' + /> + ) + }} + /> + ); } pictureSection = ( <SettingItemMin |