Move changeset created/closed time ago strings to changesets locale

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index f580ba5498ffb1a1a7f2ce05f35efe9a63a173a6..dbee08c507f175e691fffae849b45b357f3515f7 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -23,10 +23,10 @@ module ChangesetsHelper
     end
 
     if params.key?(:display_name)
     end
 
     if params.key?(:display_name)

-      t "browse.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime)
+      t "changesets.show.#{action}_ago_html", :time_ago => tag.time(time, :title => title, :datetime => datetime)

     else
     else

-      t "browse.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime),
-                                        :user => changeset_user_link(changeset)
+      t "changesets.show.#{action}_ago_by_html", :time_ago => tag.time(time, :title => title, :datetime => datetime),
+                                                 :user => changeset_user_link(changeset)

     end
   end
 
     end
   end
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index eb0f034a66941293759986b35915e8f91e2db667..6db6e77b4406d0c6b105b916fc77d70327d0d0cc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -308,10 +308,6 @@ en:
     destroy:
       success: "Account Deleted."
   browse:
     destroy:
       success: "Account Deleted."
   browse:

-    created_ago_html: "Created %{time_ago}"
-    closed_ago_html: "Closed %{time_ago}"
-    created_ago_by_html: "Created %{time_ago} by %{user}"
-    closed_ago_by_html: "Closed %{time_ago} by %{user}"

     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
     version: "Version"
     deleted_ago_by_html: "Deleted %{time_ago} by %{user}"
     edited_ago_by_html: "Edited %{time_ago} by %{user}"
     version: "Version"


@@ -466,6 +462,10 @@ en:
       title: "Changeset: %{id}"
       created: "Created: %{when}"
       closed: "Closed: %{when}"
       title: "Changeset: %{id}"
       created: "Created: %{when}"
       closed: "Closed: %{when}"

+      created_ago_html: "Created %{time_ago}"
+      closed_ago_html: "Closed %{time_ago}"
+      created_ago_by_html: "Created %{time_ago} by %{user}"
+      closed_ago_by_html: "Closed %{time_ago} by %{user}"

       discussion: Discussion
       join_discussion: "Log in to join the discussion"
       still_open: "Changeset still open - discussion will open once the changeset is closed."
       discussion: Discussion
       join_discussion: "Log in to join the discussion"
       still_open: "Changeset still open - discussion will open once the changeset is closed."