Merge pull request activeadmin#2791 from pcreux/fix-plural-i18n

Fix i18n for pluralized model names

Author: seanlinsley

features/i18n.feature

@@ -7,14 +7,19 @@ Feature: Internationalization
     And a store named "Hello words" exists
     When I go to the dashboard
     Then I should see "Bookstores"
+
     When I follow "Bookstores"
+    Then I should see the page title "Bookstores"
     Then I should see "Hello words"
+
     When I follow "View"
     Then I should see "Bookstore Details"
     And I should see "Hello words"
     And I should see a link to "Delete Bookstore"
+
     When I follow "Edit Bookstore"
     Then I should see "Edit Bookstore"
+
     When I press "Update Bookstore"
     Then I should see a flash with "Bookstore was successfully updated."
 

lib/active_admin.rb

@@ -15,6 +15,8 @@
 require 'arbre'
 require 'active_admin/engine'
 
+require 'active_admin/helpers/i18n'
+
 module ActiveAdmin
 
   autoload :VERSION,                  'active_admin/version'

lib/active_admin/form_builder.rb

@@ -90,7 +90,7 @@ def has_many(assoc, options = {}, &block)
       html = without_wrapper do
         unless builder_options.key?(:heading) && !builder_options[:heading]
           form_buffers.last << template.content_tag(:h3) do
-            builder_options[:heading] || object.class.reflect_on_association(assoc).klass.model_name.human(count: 1.1)
+            builder_options[:heading] || object.class.reflect_on_association(assoc).klass.model_name.human(count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT)
           end
         end
 

lib/active_admin/helpers/i18n.rb

@@ -0,0 +1,7 @@
+module ActiveAdmin
+  module Helpers
+    module I18n
+      PLURAL_MANY_COUNT = 2.1
+    end
+  end
+end

lib/active_admin/resource/naming.rb

@@ -22,7 +22,7 @@ def resource_label
 
       # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_label(options = {})
-        resource_name.translate ({:count => 1.1, :default => resource_label.pluralize.titleize}).merge(options)
+        resource_name.translate ({:count => ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, :default => resource_label.pluralize.titleize}).merge(options)
       end
     end
 

lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -16,7 +16,7 @@ def breadcrumb_links(path = request.path)
             config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
             name   = display_name config.find_resource part
           end
-          name ||= I18n.t "activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase
+          name ||= I18n.t "activerecord.models.#{part.singularize}", :count => ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, :default => part.titlecase
 
           link_to name, '/' + parts[0..index].join('/')
         end