From 77474b214ae9d0ba4032a8ddb720d5d6ab7e1b41 Mon Sep 17 00:00:00 2001
From: buddhamagnet <buddhamagnet@gmail.com>
Date: Sun, 6 Nov 2011 18:08:51 +0000
Subject: [PATCH 1/3] added translateable text to inbox thread times

---
 app/views/conversations/_conversation.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index c80184cd0..bf1622765 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -18,7 +18,7 @@
 
     .last_author
       .timestamp
-        = time_ago_in_words(conversation.updated_at)
+        = time_ago_in_words(conversation.updated_at) + ' ' + t('past')
       = authors[conversation.id].name
 
       - if conversation.participants.size > 2

From e9b1f3548493daaf24e11872a272a80b2807c06c Mon Sep 17 00:00:00 2001
From: buddhamagnet <buddhamagnet@gmail.com>
Date: Sun, 6 Nov 2011 18:13:35 +0000
Subject: [PATCH 2/3] added text for 'ago'

---
 config/locales/diaspora/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 37c6291b1..75a82a045 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -20,6 +20,7 @@ en:
   undo: "Undo?"
   or: "or"
   ago: "%{time} ago"
+  past: "ago"
   username: "Username"
   email: "Email"
   password: "Password"

From d8a22da275f1a7f5adcc904fd2bcd4cd76aa3ca6 Mon Sep 17 00:00:00 2001
From: buddhamagnet <buddhamagnet@gmail.com>
Date: Sun, 6 Nov 2011 18:47:51 +0000
Subject: [PATCH 3/3] amended view to pass in time to translated string for
 private inbox thread time display

---
 app/views/conversations/_conversation.haml | 2 +-
 config/locales/diaspora/en.yml             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index bf1622765..bd3cf7c95 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -18,7 +18,7 @@
 
     .last_author
       .timestamp
-        = time_ago_in_words(conversation.updated_at) + ' ' + t('past')
+        = t('ago', :time =>  time_ago_in_words(conversation.updated_at))
       = authors[conversation.id].name
 
       - if conversation.participants.size > 2
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 75a82a045..37c6291b1 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -20,7 +20,6 @@ en:
   undo: "Undo?"
   or: "or"
   ago: "%{time} ago"
-  past: "ago"
   username: "Username"
   email: "Email"
   password: "Password"