aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-06-21 11:35:02 +0200
committerSven Fuchs <svenfuchs@artweb-design.de>2008-06-21 11:35:02 +0200
commit428aa24d24032d382dc3d9ccf131e0c874043dbd (patch)
treec8c4a488beed7c1852550379984e94030d94e023 /activesupport
parentc1e2506494107892a0962b8491cd234f77949c08 (diff)
downloadrails-428aa24d24032d382dc3d9ccf131e0c874043dbd.tar.gz
rails-428aa24d24032d382dc3d9ccf131e0c874043dbd.tar.bz2
rails-428aa24d24032d382dc3d9ccf131e0c874043dbd.zip
Renamed lang/ to locale/ because that's what we seem to
standarize on. Also, in future this place can be used for data/code that's not literally translations but conceptually belongs to the locale (like custom pluralization algorithms etc.).
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support.rb2
-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