moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Format dates using CommonAPI utils.

This commit is contained in:
Phil Hagelberg 2019-10-29 21:09:05 -07:00
parent 918e1353f6
commit 93e9c0cedf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/static_fe/static_fe_view.ex
View File

@ -28,4 +28,9 @@ def emoji_for_user(%User{} = user) do
def fetch_media_type(%{"mediaType" => mediaType}) do def fetch_media_type(%{"mediaType" => mediaType}) do
Utils.fetch_media_type(@media_types, mediaType) Utils.fetch_media_type(@media_types, mediaType)
end end
def format_date(date) do
{:ok, date, _} = DateTime.from_iso8601(date)
Pleroma.Web.CommonAPI.Utils.format_asctime(date)
end
end end

2
lib/pleroma/web/templates/static_fe/static_fe/_notice.html.eex
View File

@ -1,6 +1,6 @@
<div class="activity" <%= if @selected do %> id="selected" <% end %>> <div class="activity" <%= if @selected do %> id="selected" <% end %>>
<p class="pull-right"> <p class="pull-right">
<%= link @published, to: @link, class: "activity-link" %> <%= link format_date(@published), to: @link, class: "activity-link" %>
</p> </p>
<%= render("_user_card.html", %{user: @user}) %> <%= render("_user_card.html", %{user: @user}) %>
<div class="activity-content"> <div class="activity-content">