diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb index a764add8e..f9a84da22 100644 --- a/app/helpers/people_helper.rb +++ b/app/helpers/people_helper.rb @@ -14,9 +14,9 @@ module PeopleHelper def action_link(person, is_contact) if is_contact - link_to t('.remove_friend'), person, :confirm => t('are_you_sure'), :method => :delete + link_to t('people.profile_sidebar.remove_friend'), person, :confirm => t('are_you_sure'), :method => :delete elsif person == current_user.person - link_to t('.edit_my_profile'), edit_person_path(person) + link_to t('people.profile_sidebar.edit_my_profile'), edit_person_path(person) end end diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml index 13ff35288..178b22251 100644 --- a/app/views/people/_profile_sidebar.html.haml +++ b/app/views/people/_profile_sidebar.html.haml @@ -24,16 +24,16 @@ -if is_contact || person == current_user.person %ul#profile_information %li - %b bio + %b #{t('.bio')} %br = person.profile.bio %li - %b gender + %b #{t('.gender')} %br = person.profile.gender %li - %b born + %b #{t('.born')} %br - = "#{time_ago_in_words(person.profile.birthday)} ago" if @person.profile.birthday + = "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday %b.small= person.diaspora_handle diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index d2b7ad52c..45f9882e9 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -268,16 +268,12 @@ en: index: results_for: "search results for" show: - save: "save" no_posts: "no posts to display!" add_friend: "add friend" not_friends: "You're currently not friends with %{name}" request_people: "If you'd like, you can request to place him/her in one of your aspects." already_requested: "You have already sent a request to %{name}." does_not_exist: "Person does not exist!" - bio_epic: "bio-epic" - gender: "gender" - born: "born" edit: info_available_to: "This info will be available to whomever you connect with on Diaspora." your_profile: "Your profile" @@ -300,6 +296,9 @@ en: edit_my_profile: "Edit my profile" last_seen: "last seen: %{how_long_ago}" friends_since: "friends since: %{how_long_ago}" + bio: "bio" + gender: "gender" + born: "born" helper: results_for: " results for %{params}" people_on_pod_are_aware_of: " people on pod are aware of"