tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove local_time gem, and add similar (#2875)

Browse Source
This commit is contained in:
Yamagishi Kazutoshi
2017-05-07 22:22:54 +09:00
committed by Eugen Rochko
parent 5b6c2a1e72
commit f000673599
7 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/stream_entries/_detailed_status.html.haml
View File

@ -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?

3
app/views/stream_entries/_simple_status.html.haml
View File

@ -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