recordselect 3.1.3 → 3.1.4

data/app/views/record_select/_list.html.erb

@@ -6,12 +6,12 @@ prev_url = url_for(pagination_url_params.merge(:page => page.prev.number, :escap
 next_url = url_for(pagination_url_params.merge(:page => page.next.number, :escape => false)) if page.next?
 -%>
 <ol>
-  <li class="found"><%= rs_("%d %s found", page.pager.count,
-record_select_config.model.to_s.pluralize.titleize.downcase) %></li>
+  <li class="found"><%= rs_(:records_found, :count => page.pager.count,
+:model => record_select_config.model.model_name.human(:count => page.pager.count).downcase) %></li>
   <% if page.prev? -%>
   <li class="pagination previous">
-    <%= link_to image_tag('record_select/previous.gif', :alt => rs_('Previous')) + " " + rs_("Previous %d",
-page.pager.per_page),
+    <%= link_to image_tag('record_select/previous.gif', :alt => rs_(:previous)) + " " + rs_(:previous_items,
+:count => page.pager.per_page),
                       {:url => prev_url},
                       {:href => prev_url, :method => :get, :remote => true} %>
   </li>
@@ -23,7 +23,7 @@ page.pager.per_page),
   <% end -%>
   <% if page.next? -%>
   <li class="pagination next">
-  <%= link_to (rs_("Next %d", page.pager.per_page) + " " + image_tag('record_select/next.gif', :alt => rs_('Next'))).html_safe,
+  <%= link_to (rs_(:next_items, :count => page.pager.per_page) + " " + image_tag('record_select/next.gif', :alt => rs_(:next))).html_safe,
                         {:url => next_url},
                         {:href => next_url, :method => :get, :remote => true} %>
   </li>

data/app/views/record_select/_list.html.erb~

@@ -0,0 +1,31 @@
+<%
+controller ||= params[:controller]
+
+pagination_url_params = params.merge(:controller => controller, :action => :browse, :search => params[:search], :update => 1)
+prev_url = url_for(pagination_url_params.merge(:page => page.prev.number, :escape => false)) if page.prev?
+next_url = url_for(pagination_url_params.merge(:page => page.next.number, :escape => false)) if page.next?
+-%>
+<ol>
+  <li class="found"><%= rs_(:records_found, :count => page.pager.count,
+:model => record_select_config.model.model_name.human.downcase) %></li>
+  <% if page.prev? -%>
+  <li class="pagination previous">
+    <%= link_to image_tag('record_select/previous.gif', :alt => rs_(:previous)) + " " + rs_(:previous_items,
+:count => page.pager.per_page),
+                      {:url => prev_url},
+                      {:href => prev_url, :method => :get, :remote => true} %>
+  </li>
+  <% end -%>
+  <% page.items.each do |record| -%>
+  <li class="record <%= cycle 'odd', 'even' %>" id="rs<%= record.id -%>">
+    <%= render_record_in_list(record, controller) %>
+  </li>
+  <% end -%>
+  <% if page.next? -%>
+  <li class="pagination next">
+  <%= link_to (rs_(:next_items, :count => page.pager.per_page) + " " + image_tag('record_select/next.gif', :alt => rs_(:next))).html_safe,
+                        {:url => next_url},
+                        {:href => next_url, :method => :get, :remote => true} %>
+  </li>
+  <% end -%>
+</ol>

data/lib/record_select/actions.rb

@@ -4,7 +4,7 @@ module RecordSelect
     # params => [:page, :search]
     def browse
       conditions = record_select_conditions
-      klass = record_select_config.model
+      klass = record_select_model
       @count = klass.count(:conditions => conditions, :include => record_select_includes)
       pager = ::Paginator.new(@count, record_select_config.per_page) do |offset, per_page|
         klass.find(:all, :offset => offset,
@@ -34,7 +34,7 @@ module RecordSelect
     # :method => :post
     # params => [:id]
     def select
-      klass = record_select_config.model
+      klass = record_select_model
       record = klass.find(params[:id])
       if record_select_config.notify.is_a? Proc
         record_select_config.notify.call(record)
@@ -65,4 +65,8 @@ module RecordSelect
       "record_select"
     end
   end
+
+  def record_select_model
+    record_select_config.model
+  end
 end

data/lib/record_select/extensions/localization.rb

@@ -2,7 +2,12 @@
 # to localize RS, you need to override this method and route it to your
 # own system.
 class Object
-  def rs_(string_to_localize, *args)
-    args.empty? ? string_to_localize : (sprintf string_to_localize, *args)
+  def rs_(key, options = {})
+    unless key.blank?
+      text = I18n.translate "#{key}", {:scope => [:record_select], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
+      # text = nil if text.include?('translation missing:')
+    end
+    text ||= key 
+    text
   end
 end

data/lib/record_select/extensions/localization.rb~

@@ -0,0 +1,14 @@
+# Provides a simple pass-through localizer for RecordSelect. If you want
+# to localize RS, you need to override this method and route it to your
+# own system.
+class Object
+  def rs_(string_to_localize, *args)
+    args.empty? ? string_to_localize : (sprintf string_to_localize, *args)
+    unless key.blank?
+      text = I18n.translate "#{key}", {:scope => [:record_select], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
+      # text = nil if text.include?('translation missing:')
+    end
+    text ||= key 
+    text
+  end
+end

data/lib/record_select/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 3
+    PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recordselect
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 1
-  - 3
-  version: 3.1.3
+  - 4
+  version: 3.1.4
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -92,6 +92,7 @@ files:
 - app/views/record_select/_search.html.erb
 - app/views/record_select/browse.js.erb
 - app/views/record_select/_browse.html.erb
+- app/views/record_select/_list.html.erb~
 - app/assets/images/record_select/cross.gif
 - app/assets/images/record_select/next.gif
 - app/assets/images/record_select/previous.gif
@@ -110,6 +111,7 @@ files:
 - lib/record_select/extensions/active_record.rb
 - lib/record_select/extensions/localization.rb
 - lib/record_select/extensions/routing_mapper.rb
+- lib/record_select/extensions/localization.rb~
 - lib/record_select/helpers/record_select_helper.rb
 - lib/record_select/helpers/record_select_helper.rb~
 - lib/record_select/version.rb