Merge pull request #151 from galegosimpatico/edit-time-20200826

app/views/posts/_expanded.html.erb

@@ -101,6 +101,9 @@
       <div class="post--body">
         <%= raw(sanitize(post.body, scrubber: scrubber)) %>
 
+        <% been_edited = post.last_activity_by_id != nil %>
+        <% if (been_edited) then last_edited_by_self = post.user_id == post.last_activity_by_id end %>
+
         <div class="post--meta has-margin-bottom-4">
           <%= render 'users/post_usercard', post: post %>
           <% if has_tags %>
@@ -118,16 +121,29 @@
               <% end %>
             </div>
           <% end %>
+          <% if post.license.present? || been_edited %>
+            <div class="post--licensing--edited has-margin-left-2">
               <% if post.license.present? %>
-            <div class="post--licensing has-margin-left-2">
                 <i class="fas fa-balance-scale" title="License"></i>
                 <%= link_to post.license.name, post.license.url %>
+              <% end %>
+              <% if post.license.present? && been_edited %>
+                &nbsp;
+              <% end %>
+              <% if been_edited %>
+                <i class="fa fa-pencil-alt" title="Edited"></i>
+                <span class="has-color-tertiary">
+                <%= time_ago_in_words(post.last_activity, locale: :en_abbrev) %> ago
+                <% if ! last_edited_by_self %>
+                  by <%= link_to post.last_activity_by.username, user_path(post.last_activity_by_id) %>
+                <% end %>
+                </span>
+              <% end %>
             </div>
           <% end %>
         </div>
         <div class="has-clear-clear"></div>
 
-
         <div class="post--actions">
           <div class="tools">
               <%= link_to generic_share_link(post), class: 'tools--item' do %>

config/locales/en-ABBREV.yml → config/locales/time.en_abbrev.yml

-en-ABBREV:
+en_abbrev:
   datetime:
     distance_in_words:
       x_seconds: '%{count}s'
       x_minutes: '%{count}m'
-      about_x_hours: '%{count}h'
+      about_x_hours: '~%{count}h'
       x_hours: '%{count}h'
       x_days: '%{count}d'
       x_weeks: '%{count}w'
-      about_x_months: '%{count}mo'
+      about_x_months: '~%{count}mo'
       x_months: '%{count}mo'
       x_years: '%{count}y'