diff options
author | Corey Hulen <corey@hulen.com> | 2016-03-16 18:08:46 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-03-16 18:08:46 -0700 |
commit | 59b5f162e4095ff707e215abe2182c770c0bee0b (patch) | |
tree | af15b124da597f44dc749acd1c5676e015f5c3f0 /webapp | |
parent | dd13f0bc66584f9a27b31c9c4772dacddd89064c (diff) | |
parent | 17fecd89f5db9a68248ff6b039c9e64b334f6d43 (diff) | |
download | chat-59b5f162e4095ff707e215abe2182c770c0bee0b.tar.gz chat-59b5f162e4095ff707e215abe2182c770c0bee0b.tar.bz2 chat-59b5f162e4095ff707e215abe2182c770c0bee0b.zip |
Merge pull request #2427 from ZBoxApp/PLT-2342
PLT-2342: Incorrect formatting of last password update string in all …
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 8688c7f2f..e42de91ea 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/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, { - date: ( - <FormattedDate - value={d} - day='2-digit' - month='short' - year='numeric' - /> - ), - time: ( - <FormattedTime - value={d} - hour12={hours12} - hour='2-digit' - minute='2-digit' - /> - ) - }); + describe = ( + <FormattedMessage + id='user.settings.security.lastUpdated' + defaultMessage='Last updated {date} at {time}' + values={{ + date: ( + <FormattedDate + value={d} + day='2-digit' + month='short' + year='numeric' + /> + ), + time: ( + <FormattedTime + value={d} + hour12={hours12} + hour='2-digit' + minute='2-digit' + /> + ) + }} + /> + ); updateSectionStatus = function updateSection() { this.props.updateSection('password'); |