From 3e305fb162e9befd2bff80dbf6eb491951b03422 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 12 Nov 2013 14:46:47 -0800
Subject: [PATCH] Fix lego translations

---
 app/helpers/changeset_helper.rb           | 49 +++++++++++------------
 app/views/browse/_common_details.html.erb | 18 +++------
 config/locales/en.yml                     | 23 +++++------
 3 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb
index 65391f3fc..cae1335c4 100644
--- a/app/helpers/changeset_helper.rb
+++ b/app/helpers/changeset_helper.rb
@@ -1,33 +1,32 @@
 module ChangesetHelper
+  def changeset_user_link(changeset)
+    if changeset.user.data_public?
+      link_to(changeset.user.display_name, user_path(changeset.user.display_name))
+    else
+      t('browse.anonymous')
+    end
+  end
+
   def changeset_details(changeset)
-    out = ''
-    created_at = distance_of_time_in_words_to_now(changeset.created_at)
-    closed_at = distance_of_time_in_words_to_now(changeset.closed_at)
-    date = ''
     if changeset.closed_at > DateTime.now
-      date << t('browse.created') + ' '
-      date << content_tag(:abbr, t('browse.ago', :ago => created_at), title: l(changeset.created_at))
+      action = :created
+      time = distance_of_time_in_words_to_now(changeset.created_at)
+      title = l(changeset.created_at)
     else
-      date << t('browse.closed') + ' '
-      both_times = t('browse.created') + ': ' + l(changeset.created_at)
-      both_times << '&#10;'
-      both_times << t('browse.closed') + ': ' + l(changeset.closed_at)
-      date << content_tag(:abbr, t('browse.ago', :ago => created_at), title: both_times.html_safe)
+      action = :closed
+      time = distance_of_time_in_words_to_now(changeset.closed_at)
+      title = "#{t('browse.created')}: #{l(changeset.created_at)}&#10;#{t('browse.closed')}: #{l(changeset.closed_at)}".html_safe
     end
-    out << content_tag(:span, date.html_safe, class: 'date')
-    unless params.key?(:display_name)
-      userspan = ''
-      if changeset.user.data_public?
-        userspan << ' ' + t('browse.by') + ' '
-        if changeset.user.data_public?
-          user = link_to changeset.user.display_name, user_path(changeset.user.display_name)
-        else
-          user = t('changeset.changeset.anonymous')
-        end
-        userspan << content_tag(:span, user, class: 'user')
-      end
-      out << content_tag(:span, userspan.html_safe, class: 'user')
+
+    if params.key?(:display_name)
+      t "browse.#{action}_html",
+        :time => time,
+        :title => title
+    else
+      t "browse.#{action}_by_html",
+        :time => time,
+        :title => title,
+        :user => changeset_user_link(changeset)
     end
-    return out.html_safe
   end
 end
diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb
index c1738ed9a..959820bfd 100644
--- a/app/views/browse/_common_details.html.erb
+++ b/app/views/browse/_common_details.html.erb
@@ -7,18 +7,12 @@
 </h4>
 
 <div class="details">
-  <% if common_details.visible? %>
-    <%= t 'browse.edited' %>
-  <% else %>
-    <%= t 'browse.deleted' %>
-  <% end %>
-
-  <abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
-
-  <% if common_details.changeset.user.data_public? %>
-    <%= t 'browse.by' %>
-    <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
-  <% end %>
+  <%=
+      t "browse.#{common_details.visible? ? :edited : :deleted}_by_html",
+        :time => distance_of_time_in_words_to_now(common_details.timestamp),
+        :user => changeset_user_link(common_details.changeset),
+        :title => l(common_details.timestamp)
+  %>
 </div>
 
 <div class="details">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4aeefd98a..ffaefd147 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -96,18 +96,21 @@ en:
       description: "Remote Control (JOSM or Merkaartor)"
   browse:
     created: "Created"
-    edited: "Edited"
     closed: "Closed"
-    deleted: "Deleted"
-    by: "by"
-    ago: "%{ago} ago"
+    created_html: "Created <abbr title='%{title}'>%{time} ago</abbr>"
+    closed_html: "Closed <abbr title='%{title}'>%{time} ago</abbr>"
+    created_by_html: "Created <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    deleted_by_html: "Deleted <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    edited_by_html: "Edited <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    closed_by_html: "Closed <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
     version: "Version"
     in_changeset: "Changeset"
+    anonymous: "anonymous"
     no_comment: "(no comment)"
     part_of: "Part of"
     download_xml: "Download XML"
-    view_history: "View history"
-    view_details: "View details"
+    view_history: "View History"
+    view_details: "View Details"
     changeset:
       title: "Changeset %{id}"
       belongs_to: "Author"
@@ -183,14 +186,6 @@ en:
       new_note: "New Note"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
-      opened: "Opened"
-      last_modified: "Last modified"
-      closed: "Closed"
-      at_html: "%{when} ago"
-      at_by_html: "%{when} ago by %{user}"
-      description: "Description"
-      comments: "Comments"
-      anonymous: "anonymous"
       open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
       commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
-- 
2.43.2