diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-07 22:22:54 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-07 15:22:54 +0200 |
| commit | f000673599e484d8fa20a2e39048ad816ef92afe (patch) | |
| tree | 21bc35aa0aceccb23779b31c01d33a1650e3f396 /app/views/stream_entries | |
| parent | 5b6c2a1e726fbed80ec63265aba861b17c99d40c (diff) | |
Remove local_time gem, and add similar (#2875)
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/_detailed_status.html.haml | 3 | ||||
| -rw-r--r-- | app/views/stream_entries/_simple_status.html.haml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index 0b4eeba54..4cf8acb0d 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -14,7 +14,6 @@ %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') %div.e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl?(status.content) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) - - unless status.media_attachments.empty? - if status.media_attachments.first.video? .video-player @@ -32,7 +31,7 @@ %div.detailed-status__meta %data.dt-published{ value: status.created_at.to_time.iso8601 } = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener' do - %span= local_time(status.created_at, format: :default) + %time{ datetime: status.created_at.iso8601, title: l(status.created_at), data: { format: t('time.formats.default') } }= l(status.created_at) · - if status.application - if status.application.website.blank? diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index 99acae23d..972f2abdc 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -1,7 +1,8 @@ .status.light .status__header .status__meta - = link_to local_time_ago(status.created_at), TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', title: l(status.created_at), target: stream_link_target, rel: 'noopener' + = link_to TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener' do + %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at) %data.dt-published{ value: status.created_at.to_time.iso8601 } = link_to TagManager.instance.url_for(status.account), class: 'status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do |