diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-03-14 13:51:20 -0300 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-03-16 20:44:51 -0300 |
| commit | 17fecd89f5db9a68248ff6b039c9e64b334f6d43 (patch) | |
| tree | 6b41f2a38d5927adbf5c96a95c41d96cd2d1b42f | |
| parent | 809779a87f4380b6802314271b06540a31b83f53 (diff) | |
| download | chat-17fecd89f5db9a68248ff6b039c9e64b334f6d43.tar.gz chat-17fecd89f5db9a68248ff6b039c9e64b334f6d43.tar.bz2 chat-17fecd89f5db9a68248ff6b039c9e64b334f6d43.zip | |
PLT-2342: Incorrect formatting of last password update string in all languages
| -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'); |