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

Added I18n translations to helpers

Browse source
This commit is contained in:
Ariel Zavala 2010-09-17 15:30:02 -04:00
commit cb145c346a
8 changed files with 87 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/views/people/index.html.haml
View file

@ -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

4
app/views/people/new.html.haml
View file

@ -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

10
app/views/people/show.html.haml
View file

@ -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!')

2
app/views/photos/_photo.haml
View file

@ -11,7 +11,7 @@
%span.from
= link_to post.person.real_name, post.person
%b
posted a new photo to
=t('.posted_a_new_photo_to')
= link_to post.album.name, object_path(post.album)
%br

20
config/locales/de.yml
View file

@ -120,6 +120,7 @@ de:
delete_photo: "Foto löschen"
photo:
show_comments: "Kommentare anzeigen"
posted_a_new_photo_to: "posted a new photo to"
new:
new_photo: "Foto erstellen"
back_to_list: "Zurück zur Liste"
@ -144,4 +145,21 @@ de:
message: "Nachricht"
owner: "Besitzer"
helper:
no_message_to_display: "No message to display."
no_message_to_display: "No message to display."
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"

20
config/locales/en.yml
View file

@ -121,6 +121,7 @@ en:
delete_photo: "Delete Photo"
photo:
show_comments: "show comments"
posted_a_new_photo_to: "posted a new photo to"
new:
new_photo: "New Photo"
back_to_list: "Back to List"
@ -145,4 +146,21 @@ en:
message: "Message"
owner: "Owner"
helper:
no_message_to_display: "No message to display."
no_message_to_display: "No message to display."
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"

17
config/locales/es.yml
View file

@ -122,6 +122,7 @@ es:
delete_photo: "Eliminar Foto"
photo:
show_comments: "mostrar comentarios"
posted_a_new_photo_to: "a puesto una nueva foto en"
new:
new_photo: "Nueva Foto"
back_to_list: "Devuelta a la lista"
@ -146,4 +147,18 @@ es:
message: "Mensaje"
owner: "Dueño"
helper:
no_message_to_display: "No hay mensajes que mostrar."
no_message_to_display: "No hay mensajes que mostrar."
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"

20
config/locales/fr.yml
View file

@ -111,6 +111,7 @@ fr:
delete_photo: "Supprimer la photo"
photo:
show_comments: "Montrer les commentaires"
posted_a_new_photo_to: "posted a new photo to"
new:
new_photo: "Nouvelle photo"
back_to_list: "Retour à la liste"
@ -135,4 +136,21 @@ fr:
message: "Message"
owner: "Propriétaire"
helper:
no_message_to_display: "No message to display."
no_message_to_display: "No message to display."
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"