Skip to content

Commit

Permalink
Merge pull request activeadmin#1303 from MOZGIII/1299-plural-form-in-…
Browse files Browse the repository at this point in the history
…breadcrumbs

Wrong plural form in breadcrumbs helper with Russian locale
  • Loading branch information
pcreux committed May 11, 2012
2 parents 144e66a + c56193b commit f83d1aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/active_admin/resource/naming.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def plural_resource_label
if @options[:as]
@options[:as].pluralize
else
resource_name.human(:count => 3, :default => resource_label.pluralize).titleize
resource_name.human(:count => 1.1, :default => resource_label.pluralize).titleize
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/active_admin/view_helpers/breadcrumb_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def breadcrumb_links(path = nil)

name = part.titlecase if name == ""
begin
crumbs << link_to( I18n.translate!("activerecord.models.#{part.singularize}", :count => 2), "/" + parts[0..index].join('/'))
crumbs << link_to( I18n.translate!("activerecord.models.#{part.singularize}", :count => 1.1), "/" + parts[0..index].join('/'))
rescue I18n::MissingTranslationData
crumbs << link_to( name, "/" + parts[0..index].join('/'))
end
Expand Down

0 comments on commit f83d1aa

Please sign in to comment.