summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx30
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