diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-06-15 08:13:17 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-15 08:13:17 -0400 |
| commit | ba77aefe02159325752cfa79210f5e4b5fcef77e (patch) | |
| tree | 48d41a615a07e6867a36baaa78d227a87e422348 /webapp/components/user_settings/user_settings_security.jsx | |
| parent | 3f4d38f58ae086c6570bea7082f25cbdbc52c85d (diff) | |
| download | chat-ba77aefe02159325752cfa79210f5e4b5fcef77e.tar.gz chat-ba77aefe02159325752cfa79210f5e4b5fcef77e.tar.bz2 chat-ba77aefe02159325752cfa79210f5e4b5fcef77e.zip | |
PLT-3202 Re-render timestamps when display settings switch between 12h and 24h (#3337)
* Made post timestamp switch from 12h to 24h without refreshing
* Made RHS post timestamps switch from 12h to 24h without refreshing
Diffstat (limited to 'webapp/components/user_settings/user_settings_security.jsx')
| -rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 47a762442..7a4104c36 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -8,6 +8,7 @@ import AccessHistoryModal from '../access_history_modal.jsx'; import ActivityLogModal from '../activity_log_modal.jsx'; import ToggleModalButton from '../toggle_modal_button.jsx'; +import PreferenceStore from 'stores/preference_store.jsx'; import TeamStore from 'stores/team_store.jsx'; import Client from 'utils/web_client.jsx'; @@ -471,7 +472,7 @@ class SecurityTab extends React.Component { if (this.props.user.auth_service === '') { const d = new Date(this.props.user.last_password_update); - const hours12 = !Utils.isMilitaryTime(); + const hours12 = !PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, Constants.Preferences.USE_MILITARY_TIME, false); describe = ( <FormattedMessage |