Merge pull request #3029 from movilla/master

Fixed translation missing back-to-top and add traslation "Mark unread" /app/views/notifications/index.html.haml
This commit is contained in:
Jonne Haß 2012-03-21 09:49:38 -07:00
commit 280184c85e
4 changed files with 4 additions and 2 deletions

View file

@ -58,7 +58,7 @@
= yield = yield
- unless @landing_page - unless @landing_page
%a{:id=>"back-to-top", :title=>"#{I18n.t('.back_to_top')}", :href=>"#"} %a{:id=>"back-to-top", :title=>"#{t('.back_to_top')}", :href=>"#"}
⇧ ⇧
%footer %footer

View file

@ -28,7 +28,7 @@
%div %div
%time %time
= timeago(note.created_at) = timeago(note.created_at)
= link_to "Mark unread", "#", :class => "unread-setter" = link_to t('.mark_unread'), "#", :class => "unread-setter"
= will_paginate @notifications = will_paginate @notifications

View file

@ -483,6 +483,7 @@ en:
index: index:
notifications: "Notifications" notifications: "Notifications"
mark_all_as_read: "Mark All as Read" mark_all_as_read: "Mark All as Read"
mark_unread: "Mark unread"
and_others: and_others:
zero: "and nobody else" zero: "and nobody else"
one: "and one more" one: "and one more"

View file

@ -404,6 +404,7 @@ es:
zero: "y nadie más" zero: "y nadie más"
mark_all_as_read: "Marcar todo como leído" mark_all_as_read: "Marcar todo como leído"
notifications: "Notificaciones" notifications: "Notificaciones"
mark_unread: "Marcar como no leído"
liked: liked:
few: "A %{actors} les gustó tu %{post_link}." few: "A %{actors} les gustó tu %{post_link}."
many: "A %{actors} les gustó tu %{post_link}." many: "A %{actors} les gustó tu %{post_link}."