aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
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 /actionpack
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 'actionpack')
-rw-r--r--actionpack/lib/action_view.rb2
-rw-r--r--actionpack/lib/action_view/locale/en-US.rb (renamed from actionpack/lib/action_view/lang/en-US.rb)0
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index dff487377f..067a871f79 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -33,7 +33,7 @@ require 'action_view/partials'
require 'action_view/template_error'
I18n.backend.populate do
- require 'action_view/lang/en-US.rb'
+ require 'action_view/locale/en-US.rb'
end
ActionView::Base.class_eval do
diff --git a/actionpack/lib/action_view/lang/en-US.rb b/actionpack/lib/action_view/locale/en-US.rb
index 6b5345ed90..6b5345ed90 100644
--- a/actionpack/lib/action_view/lang/en-US.rb
+++ b/actionpack/lib/action_view/locale/en-US.rb