two fixes to translations
This commit is contained in:
parent
2f2f8fef8a
commit
6cacfde6a6
4 changed files with 7 additions and 5 deletions
|
|
@ -32,7 +32,7 @@ module ApplicationHelper
|
|||
def aspect_badge aspects
|
||||
str = ''
|
||||
if aspects.count > 1
|
||||
str = "<span class='aspect_badge all'>All aspects</span>"
|
||||
str = "<span class='aspect_badge all'>#{I18n.t('application.helper.aspect_badge.all_aspects')}</span>"
|
||||
elsif aspects.count == 1
|
||||
aspect = aspects.first
|
||||
str = "<span class='aspect_badge single'><a href=#{aspect_path(aspect)}>#{aspect.name}</a></span>"
|
||||
|
|
@ -93,7 +93,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def how_long_ago(obj)
|
||||
"#{time_ago_in_words(obj.created_at, true)} #{t('ago')}"
|
||||
I18n.t('ago', :time => time_ago_in_words(obj.created_at, true))
|
||||
end
|
||||
|
||||
def person_url(person)
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@
|
|||
=person_link(person)
|
||||
= markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
|
||||
%div.time
|
||||
= comment.created_at ? "#{time_ago_in_words(comment.created_at)} #{t('ago')}" : time_ago_in_words(Time.now)
|
||||
= comment.created_at ? t('ago', :time => time_ago_in_words(comment.created_at)) : time_ago_in_words(Time.now)
|
||||
|
||||
|
|
|
|||
|
|
@ -47,5 +47,5 @@
|
|||
|
||||
.span-4.last
|
||||
%h3 #{t('.born')}
|
||||
= "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday
|
||||
= t('ago', :time => time_ago_in_words(person.profile.birthday)) if @person.profile.birthday
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ en:
|
|||
cancel: "Cancel"
|
||||
delete: "Delete"
|
||||
or: "or"
|
||||
ago: "ago"
|
||||
ago: "%{time} ago"
|
||||
username: "Username"
|
||||
email: "Email"
|
||||
password: "Password"
|
||||
|
|
@ -58,6 +58,8 @@ en:
|
|||
unknown_person: "unknown person"
|
||||
youtube_title:
|
||||
unknown: "Unknown Video Title"
|
||||
aspect_badge:
|
||||
all_aspects: "All aspects"
|
||||
error_messages:
|
||||
helper:
|
||||
invalid_fields: "Invalid Fields"
|
||||
|
|
|
|||
Loading…
Reference in a new issue