Render dates, booleans and counts through the locale files

15 files changed, 53 insertions, 24 deletions

diff --git a/app/helpers/datetime_helper.rb b/app/helpers/datetime_helper.rb
index 8497b1c0..ea6fd5c2 100644
--- a/app/helpers/datetime_helper.rb
+++ b/app/helpers/datetime_helper.rb
@@ -50,4 +50,13 @@ module DatetimeHelper
     locale == :de ? "vor #{count} #{word}" : "#{count} #{word} ago"
   end
 
+  def admin_datetime(time)
+    return "" if time.blank?
+    I18n.l(time, :format => :ccc)
+  end
+
+  def admin_date(time)
+    return "" if time.blank?
+    I18n.l(time, :format => :ccc_date)
+  end
 end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 5e84f534..1e2e91dc 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -10,4 +10,9 @@ module EventsHelper
     return "" if rrule.blank?
     raw(rrule.split(';', -1).map { |part| CGI.escapeHTML(part) }.join(';<wbr>'))
   end
+
+  def external_url_link(url)
+    return nil if url.blank?
+    url.match?(%r{\Ahttps?://}i) ? link_to(url, url) : h(url)
+  end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 7726f9bf..792ab448 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -6,6 +6,9 @@ class Event < ApplicationRecord
   acts_as_taggable_on :tags
 
   validates :title, presence: true, unless: -> { node_id.present? }
+  validates :url, :format => { :with => %r{\Ahttps?://}i,
+                               :allow_blank => true,
+                               :message => :must_be_http }
 
   after_save :generate_occurrences
 
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| %>
   <tr>
     <td><%= link_to event.display_title, event %></td>
-    <td><%=h event.start_time %></td>
-    <td><%=h event.end_time %></td>
+    <td><%= admin_datetime(event.start_time) %></td>
+    <td><%= admin_datetime(event.end_time) %></td>
     <td class="rrule_cell"><span class="rrule_text"><%= rrule_with_break_opportunities(event.rrule) %></span></td>
-    <td><%=h event.allday %> → <%= event.allday ? t("admin.common.yes") : t("admin.common.no") %></td>
-    <td class="url_cell">
-    <% if event.url.present? %>
-    <span class="truncate"><%= link_to event.url, event.url %></span>
-    <% end %>
-    </td>
-    <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
+    <td><%= t("admin.common.#{event.allday ? "yes" : "no"}") %></td>
+    <td class="url_cell"><span class="truncate"><%= external_url_link(event.url) %></span></td>
+    <td><%= event.node ? link_to(event.node.unique_name, node_path(event.node)) : "" %></td>
     <td><%= link_to t(".edit_link"), edit_event_path(event) %></td>
   </tr>
 <% 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 @@
     </div>
 
     <div class="layout_row_label"><%= Event.human_attribute_name(:start_time) %></div>
-    <div class="layout_row_content"><%=h @event.start_time %></div>
+    <div class="layout_row_content"><%= admin_datetime(@event.start_time) %></div>
 
     <div class="layout_row_label"><%= Event.human_attribute_name(:end_time) %></div>
-    <div class="layout_row_content"><%=h @event.end_time %></div>
+    <div class="layout_row_content"><%= admin_datetime(@event.end_time) %></div>
 
     <div class="layout_row_label"><%= Event.human_attribute_name(:rrule) %></div>
     <div class="layout_row_content"><%=h @event.rrule %></div>
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| %>
   <tr>
     <td><%= link_to event.display_title, event %></td>
-    <td><%=h event.start_time %></td>
-    <td><%=h event.end_time %></td>
-    <td><%=h event.allday %> → <%= event.allday ? t("admin.common.yes") : t("admin.common.no") %></td>
+    <td><%= admin_datetime(event.start_time) %></td>
+    <td><%= admin_datetime(event.end_time) %></td>
+    <td><%= t("admin.common.#{event.allday ? "yes" : "no"}") %></td>
     <td><%=h event.url %></td>
-    <td><%= link_to t("events.index.edit_link"), edit_event_path(event) %></td>
+    <td class="url_cell"><span class="truncate"><%= external_url_link(event.url) %></span></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/nodes/_node_list.html.erb b/app/views/nodes/_node_list.html.erb
index 1e5d0ed9..0dc3c5a0 100644
--- a/app/views/nodes/_node_list.html.erb
+++ b/app/views/nodes/_node_list.html.erb
@@ -34,7 +34,7 @@
       <%= link_to 'revisions', node_revisions_path(node) %>
     </td>
     <td><%= node.lock_owner.login if node.lock_owner %></td>
-    <td><%= node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY") %></td>
+    <td><%= node.draft ? node.draft.revision : (node.head ? node.head.revision : t(".no_revision")) %></td>
   </tr>
   <% end %>
 </table>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index a6167c9e..a94e001c 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -195,12 +195,12 @@
       <div class="info_group_items">
         <div class="info_item">
           <span class="info_label"><%= t(".last_updated") %></span>
-          <%= @page.updated_at %>
+          <%= admin_datetime(@page.updated_at) %>
         </div>
         <% if @page.published_at.present? %>
           <div class="info_item">
             <span class="info_label"><%= @page.public? ? t(".published_at") : t(".will_publish_at") %></span>
-            <%= @page.published_at %>
+            <%= admin_datetime(@page.published_at) %>
           </div>
         <% end %>
       </div>
diff --git a/app/views/nodes/sitemap.html.erb b/app/views/nodes/sitemap.html.erb
index f749a803..ea64b356 100644
--- a/app/views/nodes/sitemap.html.erb
+++ b/app/views/nodes/sitemap.html.erb
@@ -23,7 +23,7 @@
   <% if next_level && next_level > level %>
     <details<%= ' open' if sitemap_node_open?(node) %>>
       <summary>
-        <%= pluralize(@sitemap_descendant_counts[node.id], 'descendant', 'descendants') %>
+        <%= t(".descendants", :count => @sitemap_descendant_counts[node.id]) %>
       </summary>
     <% open_details.push(level) %>
   <% end %>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index d118f96a..3fb33b90 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -52,7 +52,7 @@
       <td class="revision"><%= page.revision %></td>
       <td class="title"><%= page.translations.find_by(:locale => @translation_locale)&.title || "—" %></td>
       <td class="user"><%= page.editor.try(:login) %></td>
-      <td class="date"><%= page.updated_at %></td>
+      <td class="date"><%= admin_datetime(page.updated_at) %></td>
       <td><%= link_to t(".show_link"), node_revision_path(@node, page, :translation_locale => @translation_locale) %></td>
       <td>
         <%= button_to t(".restore_link"), restore_node_revision_path(@node, page),
diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb
index addcfa1a..1456a051 100644
--- a/app/views/revisions/show.html.erb
+++ b/app/views/revisions/show.html.erb
@@ -22,10 +22,10 @@
     <div class="layout_row_content"><%= @page.editor.try(:login) %></div>
 
     <div class="layout_row_label"><%= t("nodes.show.last_updated") %></div>
-    <div class="layout_row_content"><%= @page.updated_at %></div>
+    <div class="layout_row_content"><%= admin_datetime(@page.updated_at) %></div>
 
     <div class="layout_row_label"><%= t("nodes.show.published_at") %></div>
-    <div class="layout_row_content"><%= @page.published_at %></div>
+    <div class="layout_row_content"><%= admin_datetime(@page.published_at) %></div>
 
     <div class="layout_row_label"><%= Page.human_attribute_name(:title) %></div>
     <div class="layout_row_content"><%= translation&.title %></div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index fc6df4e3..2685a15b 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -28,7 +28,7 @@
   <div class="layout_row_label"><%= t("users.labels.last_login") %></div>
   <div class="layout_row_content">
     <% if @user.last_login_at %>
-      <%= I18n.l(@user.last_login_at, :format => :ccc_date) %>
+      <%= admin_date(@user.last_login_at) %>
     <% else %>
       <%= t("users.never_signed_in") %>
     <% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b3319e61..9428c4be 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -161,6 +161,10 @@ de:
               not_permitted: "Dieses Asset ist an geschützte Seiten angehängt; nur die Redaktion darf es löschen"
             upload:
               unreadable_image: "konnte nicht als Bild gelesen werden. Möglicherweise ist sie beschädigt oder hat ein anderes Format, als der Name vermuten lässt."
+        event:
+          attributes:
+            url:
+              must_be_http: "must start with http:// or https://"
 
   tags:
     index:
@@ -540,11 +544,15 @@ de:
       title: "Nodes mit Tag: %{tag}"
     sitemap:
       title: "Sitemap"
+      descendants:
+        one: "1 Unterseite"
+        other: "%{count} Unterseiten"
     chapters:
       title: "Dezentrale"
       filter: "Filter"
     node_list:
       search_placeholder: "Titel, Abstract, Text durchsuchen…"
+      no_revision: "keine"
     trashed:
       title: "Papierkorb"
       empty: "Der Papierkorb ist leer."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ccca0ad0..dcf4275d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -107,6 +107,10 @@ en:
               not_permitted: "Only Redaktion members may change assets related to nodes in this section"
             upload:
               unreadable_image: "could not be read as an image. It may be damaged, or not the format its name suggests."
+        event:
+          attributes:
+            url:
+              must_be_http: "must start with http:// or https://"
 
   tags:
     index:
@@ -487,11 +491,15 @@ en:
       title: "Nodes tagged: %{tag}"
     sitemap:
       title: "Sitemap"
+      descendants:
+        one: "1 descendant"
+        other: "%{count} descendants"
     chapters:
       title: "Chapters"
       filter: "Filter"
     node_list:
       search_placeholder: "Search title, abstract, body…"
+      no_revision: "none"
     trashed:
       title: "Trash"
       empty: "The Trash is empty."
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index f15be067..27c28cfe 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -671,7 +671,7 @@ class NodesControllerTest < ActionController::TestCase
     erfas_details = erfas_node_div.next_element
 
     assert_equal 'details', erfas_details.name
-    assert_match "2 descendants", erfas_details.at_css('summary').text
+    assert_match I18n.t("nodes.sitemap.descendants", :count => 2), @response.body
   end
 
   test "sitemap shows Show and Create Child, not Revisions" do