logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 00f9f16f94feeaf2fae9a5a1a7bcb3a06b86a036
parent: 18f69fb964f73dce1e921b3fd1a391167d638e8a
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Sat, 26 Aug 2017 00:21:00 +0900

Change timezone of the datetime to what browser specifies (#4688)


Diffstat:

Mapp/views/admin/accounts/show.html.haml6++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml @@ -24,7 +24,8 @@ %th= t('admin.accounts.most_recent_activity') %td - if @account.user_current_sign_in_at - = l @account.user_current_sign_in_at + %time.formatted{ datetime: @account.user_current_sign_in_at.iso8601, title: l(@account.user_current_sign_in_at) } + = l @account.user_current_sign_in_at - else Never - else @@ -43,7 +44,8 @@ %th= t('admin.accounts.push_subscription_expires') %td - if @account.subscribed? - = l @account.subscription_expires_at + %time.formatted{ datetime: account.subscription_expires_at.iso8601, title: l(account.subscription_expires_at) } + = l @account.subscription_expires_at - else = t('admin.accounts.not_subscribed') %tr