From f7a1b09639e5a76f430dce65d99a655d0ff39ed8 Mon Sep 17 00:00:00 2001 From: movilla Date: Wed, 21 Mar 2012 15:06:14 +0100 Subject: [PATCH 1/4] Fixed translation missing back-to-top --- app/views/layouts/application.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index fc853ce40..7af102126 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -58,7 +58,7 @@ = yield - 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 From bb2d474771e9d262828148b246219ebc5cbec8b1 Mon Sep 17 00:00:00 2001 From: movilla Date: Wed, 21 Mar 2012 15:35:44 +0100 Subject: [PATCH 2/4] Add translation to "Mark unread" --- app/views/notifications/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index 4c3d091ac..c6f57f766 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -28,7 +28,7 @@ %div %time = timeago(note.created_at) - = link_to "Mark unread", "#", :class => "unread-setter" + = link_to t('.mark_unread'), "#", :class => "unread-setter" = will_paginate @notifications From 965c30f406f5145f7d3731e04d20382ad8f908a9 Mon Sep 17 00:00:00 2001 From: movilla Date: Wed, 21 Mar 2012 15:37:54 +0100 Subject: [PATCH 3/4] Update config/locales/diaspora/en.yml --- config/locales/diaspora/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 9b73ba8db..44c61e012 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -483,6 +483,7 @@ en: index: notifications: "Notifications" mark_all_as_read: "Mark All as Read" + mark_unread: "Mark unread" and_others: zero: "and nobody else" one: "and one more" From 2d32595db63039d139858b069a2f903e4dc75b3f Mon Sep 17 00:00:00 2001 From: movilla Date: Wed, 21 Mar 2012 15:41:53 +0100 Subject: [PATCH 4/4] =?UTF-8?q?A=C3=B1adida=20traducci=C3=B3n=20en=20caste?= =?UTF-8?q?llano=20para=20comprobar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/diaspora/es.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml index 5b56ab7e3..08393ab66 100644 --- a/config/locales/diaspora/es.yml +++ b/config/locales/diaspora/es.yml @@ -404,6 +404,7 @@ es: zero: "y nadie más" mark_all_as_read: "Marcar todo como leído" notifications: "Notificaciones" + mark_unread: "Marcar como no leído" liked: few: "A %{actors} les gustó tu %{post_link}." many: "A %{actors} les gustó tu %{post_link}."