From d45f46a3b1873a69bcd913c39b9f74c4f80070b4 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Fri, 12 Jul 2013 01:06:10 -0400 Subject: [PATCH] use html_safe instead of raw amatsuda/kaminari#73 --- app/views/kaminari/_first_page.html.erb | 2 +- app/views/kaminari/_first_page.html.haml | 2 +- app/views/kaminari/_first_page.html.slim | 2 +- app/views/kaminari/_gap.html.erb | 2 +- app/views/kaminari/_gap.html.haml | 2 +- app/views/kaminari/_gap.html.slim | 2 +- app/views/kaminari/_last_page.html.erb | 2 +- app/views/kaminari/_last_page.html.haml | 2 +- app/views/kaminari/_last_page.html.slim | 2 +- app/views/kaminari/_next_page.html.erb | 2 +- app/views/kaminari/_next_page.html.haml | 2 +- app/views/kaminari/_next_page.html.slim | 2 +- app/views/kaminari/_prev_page.html.erb | 2 +- app/views/kaminari/_prev_page.html.haml | 2 +- app/views/kaminari/_prev_page.html.slim | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index 404e9b0..2682d34 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %> + <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %> diff --git a/app/views/kaminari/_first_page.html.haml b/app/views/kaminari/_first_page.html.haml index ea2ed02..e38219c 100644 --- a/app/views/kaminari/_first_page.html.haml +++ b/app/views/kaminari/_first_page.html.haml @@ -6,4 +6,4 @@ -# per_page: number of items to fetch per page -# remote: data-remote %span.first - = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote + = link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote diff --git a/app/views/kaminari/_first_page.html.slim b/app/views/kaminari/_first_page.html.slim index cb1c660..fa7ef64 100644 --- a/app/views/kaminari/_first_page.html.slim +++ b/app/views/kaminari/_first_page.html.slim @@ -6,5 +6,5 @@ per_page : number of items to fetch per page remote : data-remote span.first - == link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote + == link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote ' diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb index 33b9d7a..bbb0f98 100644 --- a/app/views/kaminari/_gap.html.erb +++ b/app/views/kaminari/_gap.html.erb @@ -5,4 +5,4 @@ per_page: number of items to fetch per page remote: data-remote -%> -<%= raw(t 'views.pagination.truncate') %> +<%= t('views.pagination.truncate').html_safe %> diff --git a/app/views/kaminari/_gap.html.haml b/app/views/kaminari/_gap.html.haml index 58c0abd..dd5789c 100644 --- a/app/views/kaminari/_gap.html.haml +++ b/app/views/kaminari/_gap.html.haml @@ -5,4 +5,4 @@ -# per_page: number of items to fetch per page -# remote: data-remote %span.page.gap - = raw(t 'views.pagination.truncate') + = t('views.pagination.truncate').html_safe diff --git a/app/views/kaminari/_gap.html.slim b/app/views/kaminari/_gap.html.slim index c71155c..a1ac4c5 100644 --- a/app/views/kaminari/_gap.html.slim +++ b/app/views/kaminari/_gap.html.slim @@ -5,5 +5,5 @@ per_page : number of items to fetch per page remote : data-remote span.page.gap - == raw(t 'views.pagination.truncate') + == t('views.pagination.truncate').html_safe ' diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index 320d638..53d6130 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, :remote => remote %> + <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %> diff --git a/app/views/kaminari/_last_page.html.haml b/app/views/kaminari/_last_page.html.haml index c7eefe1..cdddb9e 100644 --- a/app/views/kaminari/_last_page.html.haml +++ b/app/views/kaminari/_last_page.html.haml @@ -6,4 +6,4 @@ -# per_page: number of items to fetch per page -# remote: data-remote %span.last - = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, :remote => remote + = link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote diff --git a/app/views/kaminari/_last_page.html.slim b/app/views/kaminari/_last_page.html.slim index ba67258..cc0a22b 100644 --- a/app/views/kaminari/_last_page.html.slim +++ b/app/views/kaminari/_last_page.html.slim @@ -6,5 +6,5 @@ per_page : number of items to fetch per page remote : data-remote span.last - == link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, :remote => remote + == link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote ' diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index 6937d27..4fc2071 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %> + <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %> diff --git a/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml index da8fd4a..2865dcd 100644 --- a/app/views/kaminari/_next_page.html.haml +++ b/app/views/kaminari/_next_page.html.haml @@ -6,4 +6,4 @@ -# per_page: number of items to fetch per page -# remote: data-remote %span.next - = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote + = link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote diff --git a/app/views/kaminari/_next_page.html.slim b/app/views/kaminari/_next_page.html.slim index dd60ac4..f7a7681 100644 --- a/app/views/kaminari/_next_page.html.slim +++ b/app/views/kaminari/_next_page.html.slim @@ -6,5 +6,5 @@ per_page : number of items to fetch per page remote : data-remote span.next - == link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote + == link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote ' diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb index b9b4da8..9c4aff4 100644 --- a/app/views/kaminari/_prev_page.html.erb +++ b/app/views/kaminari/_prev_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %> + <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %> diff --git a/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml index 43c869b..d20b1b1 100644 --- a/app/views/kaminari/_prev_page.html.haml +++ b/app/views/kaminari/_prev_page.html.haml @@ -6,4 +6,4 @@ -# per_page: number of items to fetch per page -# remote: data-remote %span.prev - = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote + = link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote diff --git a/app/views/kaminari/_prev_page.html.slim b/app/views/kaminari/_prev_page.html.slim index 5e0533d..8249cb0 100644 --- a/app/views/kaminari/_prev_page.html.slim +++ b/app/views/kaminari/_prev_page.html.slim @@ -6,5 +6,5 @@ per_page : number of items to fetch per page remote : data-remote span.prev - == link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote + == link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote '