Merge pull request #2427 from ZBoxApp/PLT-2342

PLT-2342: Incorrect formatting of last password update string in all …

webapp/components/user_settings/user_settings_security.jsx

@@ -221,24 +221,30 @@ class SecurityTab extends React.Component {
         var d = new Date(this.props.user.last_password_update);
 
         const hours12 = !Utils.isMilitaryTime();
-        describe = formatMessage(holders.lastUpdated, {
+        describe = (
-            date: (
+            <FormattedMessage
-                <FormattedDate
+                id='user.settings.security.lastUpdated'
-                    value={d}
+                defaultMessage='Last updated {date} at {time}'
-                    day='2-digit'
+                values={{
-                    month='short'
+                    date: (
-                    year='numeric'
+                        <FormattedDate
-                />
+                            value={d}
-            ),
+                            day='2-digit'
-            time: (
+                            month='short'
-                <FormattedTime
+                            year='numeric'
-                    value={d}
+                        />
-                    hour12={hours12}
+                    ),
-                    hour='2-digit'
+                    time: (
-                    minute='2-digit'
+                        <FormattedTime
-                />
+                            value={d}
-            )
+                            hour12={hours12}
-        });
+                            hour='2-digit'
+                            minute='2-digit'
+                        />
+                    )
+                }}
+            />
+        );
 
         updateSectionStatus = function updateSection() {
             this.props.updateSection('password');