Merge pull request #2471 from ZBoxApp/PLT-2368

PLT-2368: Fix for Date of last profile picture update is showing [obj…

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,7 +726,11 @@ class UserSettingsGeneralTab extends React.Component {
         } else {
             let minMessage = formatMessage(holders.uploadImage);
             if (user.last_picture_update) {
-                minMessage = formatMessage(holders.imageUpdated, {
+                minMessage = (
+                    <FormattedMessage
+                        id='user.settings.general.imageUpdated'
+                        defaultMessage='Image last updated {date}'
+                        values={{
                             date: (
                                 <FormattedDate
                                     value={new Date(user.last_picture_update)}
@@ -739,7 +739,9 @@ class UserSettingsGeneralTab extends React.Component {
                                     year='numeric'
                                 />
                             )
-                });
+                        }}
+                    />
+                );
             }
             pictureSection = (
                 <SettingItemMin