Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonne Hass <mrzyx@mrzyx.de>2011-11-07 01:12:03 +0400
committerJonne Hass <mrzyx@mrzyx.de>2011-11-07 01:12:03 +0400
commit9a556f7cb222e10de673eae51f84a525df70fab6 (patch)
tree9219efaf6768151595f7e8114c69eb52b2c5f61d
parentdb223b2a3fb6856c4a884c2a91a3bd8af87ff425 (diff)
parentd8a22da275f1a7f5adcc904fd2bcd4cd76aa3ca6 (diff)
Merge pull request #2338 from buddhamagnet/2307-private-inbox-bug
2307 private inbox bug
-rw-r--r--app/views/conversations/_conversation.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index c80184cd0..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('ago', :time => time_ago_in_words(conversation.updated_at))
= authors[conversation.id].name
- if conversation.participants.size > 2