Clearer date reporting in metadata

Author: lmrodriguezr

app/helpers/application_helper.rb

@@ -18,11 +18,13 @@ def download_link(file, name = nil)
     end
   end
 
-  def time_ago_with_date(date)
+  def time_ago_with_date(date, capitalize = false)
     date  = DateTime.parse(date) if date.is_a?(String)
     fdate = date.strftime('%F %I:%M %p (%Z)')
     content_tag(:u, class: 'hover-help', title: fdate) do
-      time_ago_in_words(date) + ' ago'
+      s = time_ago_in_words(date) + ' ago'
+      s[0] = s[0].upcase if capitalize
+      s
     end
   end
 

app/views/names/_metadata.html.erb

@@ -182,21 +182,22 @@
     </dd>
   <% end %>
 
-  <dt><%= fa_icon('user') %> Registered by</dt>
+  <dt><%= fa_icon('user') %> Registered</dt>
   <dd>
-    <%= @name.created_by ?
-          display_link(@name.created_by) : 'Excubia bot' %>,
-    created <%= time_ago_with_date(@name.created_at) %>
+    <%= time_ago_with_date(@name.created_at, true) %>
     <% if @name.claimed_at %>
       and claimed <%= time_ago_with_date(@name.claimed_at) %>
     <% end %>
+    by
+    <%= @name.created_by ?
+          display_link(@name.created_by) : 'Excubia bot' %>
   </dd>
 
   <% if @name.submitted_by %>
-    <dt><%= fa_icon('paper-plane') %> Submitted by</dt>
+    <dt><%= fa_icon('paper-plane') %> Submitted</dt>
     <dd>
-      <%= display_link(@name.submitted_by) %>
-      <%= time_ago_with_date(@name.submitted_at) %>
+      <%= time_ago_with_date(@name.submitted_at, true) %>
+      by <%= display_link(@name.submitted_by) %>
     </dd>
   <% end %>
 
@@ -220,22 +221,22 @@
   <% end %>
 
   <% if @name.after_endorsement? && @name.endorsed_by %>
-    <dt><%= fa_icon('check-square') %> Endorsed by</dt>
+    <dt><%= fa_icon('check-square') %> Endorsed</dt>
     <dd>
-      <%= display_link(@name.endorsed_by) %>
-      <%= time_ago_with_date(@name.endorsed_at) %>
+      <%= time_ago_with_date(@name.endorsed_at, true) %>
+      by <%= display_link(@name.endorsed_by) %>
     </dd>
   <% end %>
 
   <% if @name.valid? && @name.validated_by %>
     <% if @name.status == 15 %>
-      <dt><%= fa_icon('certificate') %> Validated by</dt>
+      <dt><%= fa_icon('certificate') %> Validated</dt>
     <% else %>
-      <dt><%= fa_icon('stamp') %> Reported valid by</dt>
+      <dt><%= fa_icon('stamp') %> Reported valid</dt>
     <% end %>
     <dd>
-      <%= display_link(@name.validated_by) %>
-      <%= time_ago_with_date(@name.validated_at) %>
+      <%= time_ago_with_date(@name.validated_at, true) %>
+      by <%= display_link(@name.validated_by) %>
     </dd>
   <% end %>
 

app/views/registers/_metadata.html.erb

@@ -12,10 +12,10 @@
     <% end %>
   </dd>
 
-  <dt><%= fa_icon(:user) %> Created by</dt>
+  <dt><%= fa_icon(:user) %> Created</dt>
   <dd>
-    <%= display_link(@register.created_by) %>
-    <%= time_ago_with_date(@register.created_at) %>
+    <%= time_ago_with_date(@register.created_at, true) %>
+    by <%= display_link(@register.created_by) %>
   </dd>
 
   <dt><%= fa_icon 'calendar' %> Local history</dt>
@@ -75,22 +75,23 @@
   <% end %>
 
   <% if @register.validated? %>
-    <dt><%= fa_icon('certificate') %> Validated by</dt>
+    <dt><%= fa_icon('certificate') %> Validated</dt>
     <dd>
+      <%= time_ago_with_date(@register.validated_at, true) %>
+      by
       <% if @register.validated_by %>
         <%= display_link(@register.validated_by) %>
       <% else %>
-        Unknown curator
+        an unknown curator
       <% end %>
-      <%= time_ago_with_date(@register.validated_at) %>
     </dd>
   <% end %>
 
   <% if @register.published? %>
-    <dt><%= fa_icon('newspaper') %> Edited by</dt>
+    <dt><%= fa_icon('newspaper') %> Edited</dt>
     <dd>
-      <%= display_link(@register.published_by) %>
-      <%= time_ago_with_date(@register.published_at) %>
+      <%= time_ago_with_date(@register.published_at, true) %>
+      by <%= display_link(@register.published_by) %>
     </dd>
   <% end %>