From 84657fa9d633a7d3e20c10645589061ecebeee3f Mon Sep 17 00:00:00 2001 From: erdgeist Date: Mon, 3 Aug 2026 17:12:34 +0200 Subject: Render dates, booleans and counts through the locale files --- app/views/events/index.html.erb | 14 +++++--------- app/views/events/show.html.erb | 4 ++-- app/views/events/without_node.html.erb | 8 ++++---- 3 files changed, 11 insertions(+), 15 deletions(-) (limited to 'app/views/events') diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index 138a02ec..7dfb854c 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -24,16 +24,12 @@ <% @events.each do |event| %> <%= link_to event.display_title, event %> - <%=h event.start_time %> - <%=h event.end_time %> + <%= admin_datetime(event.start_time) %> + <%= admin_datetime(event.end_time) %> <%= rrule_with_break_opportunities(event.rrule) %> - <%=h event.allday %> → <%= event.allday ? t("admin.common.yes") : t("admin.common.no") %> - - <% if event.url.present? %> - <%= link_to event.url, event.url %> - <% end %> - - <%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %> + <%= t("admin.common.#{event.allday ? "yes" : "no"}") %> + <%= external_url_link(event.url) %> + <%= event.node ? link_to(event.node.unique_name, node_path(event.node)) : "" %> <%= link_to t(".edit_link"), edit_event_path(event) %> <% end %> diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index 98e972c6..d77f770e 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -24,10 +24,10 @@
<%= Event.human_attribute_name(:start_time) %>
-
<%=h @event.start_time %>
+
<%= admin_datetime(@event.start_time) %>
<%= Event.human_attribute_name(:end_time) %>
-
<%=h @event.end_time %>
+
<%= admin_datetime(@event.end_time) %>
<%= Event.human_attribute_name(:rrule) %>
<%=h @event.rrule %>
diff --git a/app/views/events/without_node.html.erb b/app/views/events/without_node.html.erb index c610b560..e59eedc7 100644 --- a/app/views/events/without_node.html.erb +++ b/app/views/events/without_node.html.erb @@ -20,11 +20,11 @@ <% @events.each do |event| %> <%= link_to event.display_title, event %> - <%=h event.start_time %> - <%=h event.end_time %> - <%=h event.allday %> → <%= event.allday ? t("admin.common.yes") : t("admin.common.no") %> + <%= admin_datetime(event.start_time) %> + <%= admin_datetime(event.end_time) %> + <%= t("admin.common.#{event.allday ? "yes" : "no"}") %> <%=h event.url %> - <%= link_to t("events.index.edit_link"), edit_event_path(event) %> + <%= external_url_link(event.url) %> <% end %> -- cgit v1.3