Avoid raw html in translations for changeset comments

[rails.git] / lib / classic_pagination / pagination_helper.rb

diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb
index 01260f9e05688444fa0cdfc3ee0a80e0bd5ac81e..3ff3c3b950974f515bb4f41cc9e09617d320d3f0 100644 (file)
--- a/lib/classic_pagination/pagination_helper.rb
+++ b/lib/classic_pagination/pagination_helper.rb
@@ -13,7 +13,7 @@ module ActionView
           :always_show_anchors => true,
           :link_to_current_page => false,
           :params => {}
           :always_show_anchors => true,
           :link_to_current_page => false,
           :params => {}

-        }
+        }.freeze

       end
 
       # Creates a basic HTML link bar for the given +paginator+.  Links will be created
       end
 
       # Creates a basic HTML link bar for the given +paginator+.  Links will be created


@@ -56,12 +56,12 @@ module ActionView
       #  pagination_links(@person_pages, :params => { :viewer => "flash" })
       #  # => 1 <a href="/?page=2&amp;viewer=flash/">2</a> <a href="/?page=3&amp;viewer=flash/">3</a>  ...
       #  #    <a href="/?page=10&amp;viewer=flash/">10</a>
       #  pagination_links(@person_pages, :params => { :viewer => "flash" })
       #  # => 1 <a href="/?page=2&amp;viewer=flash/">2</a> <a href="/?page=3&amp;viewer=flash/">3</a>  ...
       #  #    <a href="/?page=10&amp;viewer=flash/">10</a>

-      def pagination_links(paginator, options={}, html_options={})
+      def pagination_links(paginator, options = {}, html_options = {})

         name = options[:name] || DEFAULT_OPTIONS[:name]
         params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
 
         name = options[:name] || DEFAULT_OPTIONS[:name]
         params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
 

-        prefix = options[:prefix] || ''
-        suffix = options[:suffix] || ''
+        prefix = options[:prefix] || ""
+        suffix = options[:suffix] || ""

 
         pagination_links_each(paginator, options, prefix, suffix) do |n|
           params[name] = n
 
         pagination_links_each(paginator, options, prefix, suffix) do |n|
           params[name] = n


@@ -97,31 +97,32 @@ module ActionView
 
         current_page = paginator.current_page
         window_pages = current_page.window(options[:window_size]).pages
 
         current_page = paginator.current_page
         window_pages = current_page.window(options[:window_size]).pages

-        return if window_pages.length <= 1 unless link_to_current_page
+        return unless link_to_current_page || window_pages.length > 1

 
 

-        first, last = paginator.first, paginator.last
+        first = paginator.first
+        last = paginator.last

 
 

-        html = ''
+        html = ""

 
         html << prefix if prefix
 
 
         html << prefix if prefix
 

-        if always_show_anchors and not (wp_first = window_pages[0]).first?
+        if always_show_anchors && !(wp_first = window_pages[0]).first?

           html << yield(first.number)
           html << yield(first.number)

-          html << ' ... ' if wp_first.number - first.number > 1
-          html << ' '
+          html << " ... " if wp_first.number - first.number > 1
+          html << " "

         end
 
         window_pages.each do |page|
         end
 
         window_pages.each do |page|

-          if current_page == page && !link_to_current_page
-            html << page.number.to_s
-          else
-            html << yield(page.number)
-          end
-          html << ' '
+          html << if current_page == page && !link_to_current_page
+                    page.number.to_s
+                  else
+                    yield(page.number)
+                  end
+          html << " "

         end
 
         end
 

-        if always_show_anchors and not (wp_last = window_pages[-1]).last?
-          html << ' ... ' if last.number - wp_last.number > 1
+        if always_show_anchors && !(wp_last = window_pages[-1]).last?
+          html << " ... " if last.number - wp_last.number > 1

           html << yield(last.number)
         end
 
           html << yield(last.number)
         end
 


@@ -129,7 +130,6 @@ module ActionView
 
         html
       end
 
         html
       end

-
-    end # PaginationHelper
-  end # Helpers
-end # ActionView
+    end
+  end
+end