PLT-2368: Fix for Date of last profile picture update is showing [object][object]

Этот коммит содержится в:
Elias Nahum
2016-03-18 12:12:35 -03:00
родитель 5b824cb855
Коммит 5a4945c4d5

Просмотреть файл

@@ -60,10 +60,6 @@ const holders = defineMessages({
id: 'user.settings.general.uploadImage', id: 'user.settings.general.uploadImage',
defaultMessage: "Click 'Edit' to upload an image." defaultMessage: "Click 'Edit' to upload an image."
}, },
imageUpdated: {
id: 'user.settings.general.imageUpdated',
defaultMessage: 'Image last updated {date}'
},
fullName: { fullName: {
id: 'user.settings.general.fullName', id: 'user.settings.general.fullName',
defaultMessage: 'Full Name' defaultMessage: 'Full Name'
@@ -730,16 +726,22 @@ class UserSettingsGeneralTab extends React.Component {
} else { } else {
let minMessage = formatMessage(holders.uploadImage); let minMessage = formatMessage(holders.uploadImage);
if (user.last_picture_update) { if (user.last_picture_update) {
minMessage = formatMessage(holders.imageUpdated, { minMessage = (
date: ( <FormattedMessage
<FormattedDate id='user.settings.general.imageUpdated'
value={new Date(user.last_picture_update)} defaultMessage='Image last updated {date}'
day='2-digit' values={{
month='short' date: (
year='numeric' <FormattedDate
/> value={new Date(user.last_picture_update)}
) day='2-digit'
}); month='short'
year='numeric'
/>
)
}}
/>
);
} }
pictureSection = ( pictureSection = (
<SettingItemMin <SettingItemMin