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

fixing again. it's getting anoying

Browse source
This commit is contained in:
MrZYX 2010-11-06 19:47:33 +01:00 committed by Jonne Hass
parent 8085a7bcd7
commit 6400dc244f
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/people_helper.rb
View file

@ -14,9 +14,9 @@ module PeopleHelper
def action_link(person, is_contact) def action_link(person, is_contact)
if 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 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
end end

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

@ -24,16 +24,16 @@
-if is_contact || person == current_user.person -if is_contact || person == current_user.person
%ul#profile_information %ul#profile_information
%li %li
%b bio %b #{t('.bio')}
%br %br
= person.profile.bio = person.profile.bio
%li %li
%b gender %b #{t('.gender')}
%br %br
= person.profile.gender = person.profile.gender
%li %li
%b born %b #{t('.born')}
%br %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 %b.small= person.diaspora_handle

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

@ -268,16 +268,12 @@ en:
index: index:
results_for: "search results for" results_for: "search results for"
show: show:
save: "save"
no_posts: "no posts to display!" no_posts: "no posts to display!"
add_friend: "add friend" add_friend: "add friend"
not_friends: "You're currently not friends with %{name}" 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." 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}." already_requested: "You have already sent a request to %{name}."
does_not_exist: "Person does not exist!" does_not_exist: "Person does not exist!"
bio_epic: "bio-epic"
gender: "gender"
born: "born"
edit: edit:
info_available_to: "This info will be available to whomever you connect with on Diaspora." info_available_to: "This info will be available to whomever you connect with on Diaspora."
your_profile: "Your profile" your_profile: "Your profile"
@ -300,6 +296,9 @@ en:
edit_my_profile: "Edit my profile" edit_my_profile: "Edit my profile"
last_seen: "last seen: %{how_long_ago}" last_seen: "last seen: %{how_long_ago}"
friends_since: "friends since: %{how_long_ago}" friends_since: "friends since: %{how_long_ago}"
bio: "bio"
gender: "gender"
born: "born"
helper: helper:
results_for: " results for %{params}" results_for: " results for %{params}"
people_on_pod_are_aware_of: " people on pod are aware of" people_on_pod_are_aware_of: " people on pod are aware of"