diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index a0c7741475..1269773aa2 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -429,7 +429,7 @@
{{i18n 'admin.users.last_emailed'}}
-
{{format-date model.last_emailed_at leaveAgo="true"}}
+
{{format-date model.last_emailed_at}}
{{i18n 'last_seen'}}
@@ -474,7 +474,7 @@
{{i18n 'admin.user.time_read'}}
-
{{{model.time_read}}}
+
{{{format-duration model.time_read}}}
{{i18n 'user.invited.days_visited'}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs index cd292cb3e0..6239e88385 100644 --- a/app/assets/javascripts/admin/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/templates/users-list-show.hbs @@ -60,10 +60,10 @@ {{unbound user.email}} - {{{unbound user.last_emailed_age}}} + {{{format-duration user.last_emailed_age}}} - {{{unbound user.last_seen_age}}} + {{{format-duration user.last_seen_age}}} {{number user.topics_entered}} @@ -72,11 +72,11 @@ {{number user.posts_read_count}} - {{{unbound user.time_read}}} + {{{format-duration user.time_read}}} - {{{unbound user.created_at_age}}} + {{{format-duration user.created_at_age}}} {{#if showApproval}} diff --git a/app/assets/javascripts/discourse/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/templates/components/directory-item.hbs index 4b1d9a940e..e7758227f4 100644 --- a/app/assets/javascripts/discourse/templates/components/directory-item.hbs +++ b/app/assets/javascripts/discourse/templates/components/directory-item.hbs @@ -7,5 +7,5 @@ {{number item.posts_read}} {{number item.days_visited}} {{#if showTimeRead}} - {{unbound item.time_read}} + {{format-duration item.time_read}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index fab58ece1f..5f8dc6d18a 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -71,7 +71,7 @@ {{format-date invite.user.last_seen_at}} {{number invite.user.topics_entered}} {{number invite.user.posts_read_count}} - {{{unbound invite.user.time_read}}} + {{{format-duration invite.user.time_read}}} {{{unbound invite.user.days_visited}}} / {{{unbound invite.user.days_since_created}}} diff --git a/app/serializers/admin_user_list_serializer.rb b/app/serializers/admin_user_list_serializer.rb index 251ba21035..90471d529b 100644 --- a/app/serializers/admin_user_list_serializer.rb +++ b/app/serializers/admin_user_list_serializer.rb @@ -80,7 +80,7 @@ class AdminUserListSerializer < BasicUserSerializer def last_emailed_age return nil if object.last_emailed_at.blank? - AgeWords.age_words(Time.now - object.last_emailed_at) + Time.now - object.last_emailed_at end def last_seen_at @@ -90,16 +90,16 @@ class AdminUserListSerializer < BasicUserSerializer def last_seen_age return nil if object.last_seen_at.blank? - AgeWords.age_words(Time.now - object.last_seen_at) + Time.now - object.last_seen_at end def time_read return nil if object.user_stat.time_read.blank? - AgeWords.age_words(object.user_stat.time_read) + object.user_stat.time_read end def created_at_age - AgeWords.age_words(Time.now - object.created_at) + Time.now - object.created_at end def can_approve diff --git a/app/serializers/directory_item_serializer.rb b/app/serializers/directory_item_serializer.rb index e241dc6f6c..753d7a8ad7 100644 --- a/app/serializers/directory_item_serializer.rb +++ b/app/serializers/directory_item_serializer.rb @@ -11,7 +11,7 @@ class DirectoryItemSerializer < ApplicationSerializer end def time_read - AgeWords.age_words(object.user_stat.time_read) + object.user_stat.time_read end def include_time_read? diff --git a/app/serializers/invited_user_serializer.rb b/app/serializers/invited_user_serializer.rb index ce3fe90623..3c1cb69d3c 100644 --- a/app/serializers/invited_user_serializer.rb +++ b/app/serializers/invited_user_serializer.rb @@ -10,7 +10,7 @@ class InvitedUserSerializer < BasicUserSerializer attr_accessor :invited_by def time_read - AgeWords.age_words(object.user_stat.time_read) + object.user_stat.time_read end def include_time_read?