diff options
| author | Nick Cox <nick@nickcox.me> | 2013-04-10 04:20:36 +0000 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2013-04-10 04:22:34 +0000 |
| commit | 8cf88cc75ad0289f39fc2272c372f945b3934e76 (patch) | |
| tree | 1ebae434bbcb994747f9d311eb9373a1e5c92336 /activesupport/lib/active_support | |
| parent | 9039c5038823754f79e04f1e83723e46229dbe05 (diff) | |
| download | rails-8cf88cc75ad0289f39fc2272c372f945b3934e76.tar.gz rails-8cf88cc75ad0289f39fc2272c372f945b3934e76.tar.bz2 rails-8cf88cc75ad0289f39fc2272c372f945b3934e76.zip | |
Fix inflector to respect default locale.
The inflector was made aware of locales in 7db0b073fec6bc3e6f213b58c76e7f43fcc2ab97,
but it defaulted to :en. That should actually be our default
locale instead.
Fixes #10125
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/inflections.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb index 6522145572..b38fa9125a 100644 --- a/activesupport/lib/active_support/core_ext/string/inflections.rb +++ b/activesupport/lib/active_support/core_ext/string/inflections.rb @@ -28,7 +28,7 @@ class String # 'apple'.pluralize(2) # => "apples" # 'ley'.pluralize(:es) # => "leyes" # 'ley'.pluralize(1, :es) # => "ley" - def pluralize(count = nil, locale = :en) + def pluralize(count = nil, locale = I18n.locale) locale = count if count.is_a?(Symbol) if count == 1 self @@ -51,7 +51,7 @@ class String # 'the blue mailmen'.singularize # => "the blue mailman" # 'CamelOctopi'.singularize # => "CamelOctopus" # 'leyes'.singularize(:es) # => "ley" - def singularize(locale = :en) + def singularize(locale = I18n.locale) ActiveSupport::Inflector.singularize(self, locale) end |