Skip to content
Snippets Groups Projects
Commit 07b2e676 authored by Gabriel Engel's avatar Gabriel Engel Committed by GitHub
Browse files

Merge pull request #3968 from tgxn/formats 

Add time formatting on user time.
parents 1d7910a4 89b88e80
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee
+ 1
− 1
View file @ 07b2e676
...@@ -42,7 +42,7 @@ Template.userInfo.helpers ...@@ -42,7 +42,7 @@ Template.userInfo.helpers
userTime: -> userTime: ->
user = Template.instance().user.get() user = Template.instance().user.get()
if user.utcOffset? if user.utcOffset?
return Template.instance().now.get().utcOffset(user.utcOffset).format('LT') return Template.instance().now.get().utcOffset(user.utcOffset).format(RocketChat.settings.get('Message_TimeFormat'))
canRemoveUser: -> canRemoveUser: ->
return RocketChat.authz.hasAllPermission('remove-user', Session.get('openedRoom')) return RocketChat.authz.hasAllPermission('remove-user', Session.get('openedRoom'))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment