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"