diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/locale/en-US.rb (renamed from activesupport/lib/active_support/lang/en-US.rb) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 0de948dda9..de50aafe16 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -57,7 +57,7 @@ require 'active_support/base64' require 'active_support/time_with_zone' I18n.backend.populate do - require 'active_support/lang/en-US.rb' + require 'active_support/locale/en-US.rb' end Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector') diff --git a/activesupport/lib/active_support/lang/en-US.rb b/activesupport/lib/active_support/locale/en-US.rb index aa06fe14bd..aa06fe14bd 100644 --- a/activesupport/lib/active_support/lang/en-US.rb +++ b/activesupport/lib/active_support/locale/en-US.rb |