From 5e3c6f63be7abdb7dbb856c110048663dc6f4875 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 26 Aug 2017 00:21:00 +0900 Subject: [PATCH] Change timezone of the datetime to what browser specifies (#4688) --- app/views/admin/accounts/show.html.haml | 6 ++++-- 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 index 18bcd5e8ed..85841d7a13 100644 --- 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