diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index c18ec5d0a..57e46d6df 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -17,8 +17,8 @@ = (@people.count).to_s + search_or_index %table %tr - %th real name - %th diaspora handle + %th=t('.real_name') + %th=t('.diaspora_handle') %th url - for person in @people %tr @@ -34,18 +34,18 @@ - elsif person.id == current_user.person.id %td - %td that's you! + %td=t('.thats_you') -elsif current_user.pending_requests.find_by_person_id(person.id) %td - %td ^-you have a friend request from this person + %td="^-#{t('.you_have_a_friend_request_from_this_person')}" -elsif current_user.pending_requests.find_by_url(person.receive_url) %td - %td friend request pending + %td=t('.friend_request_pending') -else %td %td = form_for Request.new do |f| = f.select(:aspect_id, @aspects_dropdown_array) = f.hidden_field :destination_url, :value => person.diaspora_handle - = f.submit "add friend" + = f.submit t('.add_friend') = will_paginate @people diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml index b2203eb3f..25821ed37 100644 --- a/app/views/people/new.html.haml +++ b/app/views/people/new.html.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. -- title "New Person" +- title=t('.new_person') = form_for @person do |f| = f.error_messages @@ -29,4 +29,4 @@ = f.submit -%p= link_to "Back to List", people_path +%p= link_to t('.back_to_list'), people_path diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 4f76f18cf..93705f15c 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -13,19 +13,19 @@ %ul -unless @posts.first.nil? %li - %i= "last seen: #{how_long_ago(@posts.first)}" + %i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first)) - if @person != current_user.person && current_user.friends.include?(@person) %li - %i= "friends since: #{how_long_ago(@person)}" + %i= t(".friends_since",:how_long_ago => how_long_ago(@person)) %li = form_tag move_friend_path = select :to, :to, @aspects_dropdown_array, :selected => @aspects_with_person.first.id = hidden_field_tag :from, :from, :value => @aspects_with_person.first.id = hidden_field_tag :friend_id, :friend_id, :value => @person.id - = submit_tag "save" + = submit_tag t('.save') - if @person != current_user.person && current_user.friends.include?(@person) - = link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete, :class => "button" + = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button" .span-20.last @@ -36,4 +36,4 @@ = render type_partial(post), :post => post unless post.class == Album = will_paginate @posts - else - %h3 no posts to display! + %h3=t('no posts to display!') diff --git a/config/locales/de.yml b/config/locales/de.yml index f7a4f0535..e44d4b788 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -122,5 +122,20 @@ de: view_all: "Alle anzeigen" message: "Nachricht" owner: "Besitzer" - - + people: + index: + add_friend: "add friend" + real_name: "real name" + diaspora_handle: "diaspora handle" + thats_you: "that's you!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + new: + new_person: "New Person" + back_to_list: "Back to List" + show: + last_seen: "last seen: %{how_long_ago}" + friends_since: "friends since: %{how_long_ago}" + save: "save" + are_you_sure: "Are you sure?" + remove_friend: "remove friend" \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index b1b7e98a7..e68a27763 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -123,5 +123,20 @@ en: view_all: "View All" message: "Message" owner: "Owner" - - + people: + index: + add_friend: "add friend" + real_name: "real name" + diaspora_handle: "diaspora handle" + thats_you: "that's you!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + new: + new_person: "New Person" + back_to_list: "Back to List" + show: + last_seen: "last seen: %{how_long_ago}" + friends_since: "friends since: %{how_long_ago}" + save: "save" + are_you_sure: "Are you sure?" + remove_friend: "remove friend" \ No newline at end of file diff --git a/config/locales/es.yml b/config/locales/es.yml index 03fefdca4..cb8bef6cd 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -123,4 +123,18 @@ es: destroy: "Destruir" view_all: "Ver Todos" message: "Mensaje" - owner: "Dueño" \ No newline at end of file + owner: "Dueño" + people: + index: + add_friend: "añadir amigo" + real_name: "nombre real" + diaspora_handle: "usuario en diaspora" + thats_you: "ese eres tu!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + show: + last_seen: "ultima vez visto: %{how_long_ago}" + friends_since: "amigos desde: %{how_long_ago}" + save: "guardar" + are_you_sure: "Esta seguro?" + remove_friend: "remover amigo" \ No newline at end of file diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 052819b65..760993177 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -113,3 +113,20 @@ fr: view_all: "Tout voir" message: "Message" owner: "Propriétaire" + people: + index: + add_friend: "add friend" + real_name: "real name" + diaspora_handle: "diaspora handle" + thats_you: "that's you!" + friend_request_pending: "friend request pending" + you_have_a_friend_request_from_this_person: "you have a friend request from this person" + new: + new_person: "New Person" + back_to_list: "Back to List" + show: + last_seen: "last seen: %{how_long_ago}" + friends_since: "friends since: %{how_long_ago}" + save: "save" + are_you_sure: "Are you sure?" + remove_friend: "remove friend" \ No newline at end of file