nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

two fixes to translations

Browse source
This commit is contained in:
MrZYX 2010-12-12 15:55:51 +01:00
parent 2f2f8fef8a
commit 6cacfde6a6
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -32,7 +32,7 @@ module ApplicationHelper
def aspect_badge aspects def aspect_badge aspects
str = '' str = ''
if aspects.count > 1 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 elsif aspects.count == 1
aspect = aspects.first aspect = aspects.first
str = "<span class='aspect_badge single'><a href=#{aspect_path(aspect)}>#{aspect.name}</a></span>" str = "<span class='aspect_badge single'><a href=#{aspect_path(aspect)}>#{aspect.name}</a></span>"
@ -93,7 +93,7 @@ module ApplicationHelper
end end
def how_long_ago(obj) 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 end
def person_url(person) def person_url(person)

2
app/views/comments/_comment.html.haml
View file

@ -10,5 +10,5 @@
=person_link(person) =person_link(person)
= markdownify(comment.text, :youtube_maps => comment[:youtube_titles]) = markdownify(comment.text, :youtube_maps => comment[:youtube_titles])
%div.time %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)

2
app/views/people/_profile_sidebar.html.haml
View file

@ -47,5 +47,5 @@
.span-4.last .span-4.last
%h3 #{t('.born')} %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

4
config/locales/diaspora/en.yml
View file

@ -15,7 +15,7 @@ en:
cancel: "Cancel" cancel: "Cancel"
delete: "Delete" delete: "Delete"
or: "or" or: "or"
ago: "ago" ago: "%{time} ago"
username: "Username" username: "Username"
email: "Email" email: "Email"
password: "Password" password: "Password"
@ -58,6 +58,8 @@ en:
unknown_person: "unknown person" unknown_person: "unknown person"
youtube_title: youtube_title:
unknown: "Unknown Video Title" unknown: "Unknown Video Title"
aspect_badge:
all_aspects: "All aspects"
error_messages: error_messages:
helper: helper:
invalid_fields: "Invalid Fields" invalid_fields: "Invalid Fields"