diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-10 12:42:52 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-10 12:44:39 -0300 |
| commit | d716fe05dfc174af4d840258b52e690ff754c8c3 (patch) | |
| tree | e94522e55df9d9abcebe5799b059bd8b6d374397 /activesupport/lib | |
| parent | 40410681255a430c4b45cb97f00ea4b1eaa1b862 (diff) | |
| download | rails-d716fe05dfc174af4d840258b52e690ff754c8c3.tar.gz rails-d716fe05dfc174af4d840258b52e690ff754c8c3.tar.bz2 rails-d716fe05dfc174af4d840258b52e690ff754c8c3.zip | |
Revert "Merge pull request #10158 from steveklabnik/issue_10125"
This reverts commit fa3ef8e82ab2f96cf15ef9bc885b2468fad77621, reversing
changes made to e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b.
Reason: Routes, Active Record and the rendering stack should not depend
on the default locale
Diffstat (limited to 'activesupport/lib')
| -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 b38fa9125a..6522145572 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 = I18n.locale) + def pluralize(count = nil, locale = :en) 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 = I18n.locale) + def singularize(locale = :en) ActiveSupport::Inflector.singularize(self, locale) end |