diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-11-18 09:59:46 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-18 14:23:53 +0100 |
| commit | 12118963acacc9c869bdd41ef8480a1a4e06d358 (patch) | |
| tree | f08b102f58bcf9d3b87e1dab97d6f62f5c844b69 /activerecord/lib | |
| parent | d9b92ee11b33fed5c7a94a91415fa846705f7dd3 (diff) | |
| download | rails-12118963acacc9c869bdd41ef8480a1a4e06d358.tar.gz rails-12118963acacc9c869bdd41ef8480a1a4e06d358.tar.bz2 rails-12118963acacc9c869bdd41ef8480a1a4e06d358.zip | |
use :en as a default locale (in favor of :en-US)
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/locale/en.yml (renamed from activerecord/lib/active_record/locale/en-US.yml) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 219cd30f94..7fdef17a45 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -78,4 +78,4 @@ require 'active_record/connection_adapters/abstract_adapter' require 'active_record/schema_dumper' require 'active_record/i18n_interpolation_deprecation' -I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en-US.yml' +I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml' diff --git a/activerecord/lib/active_record/locale/en-US.yml b/activerecord/lib/active_record/locale/en.yml index 421f0ebd60..7e205435f7 100644 --- a/activerecord/lib/active_record/locale/en-US.yml +++ b/activerecord/lib/active_record/locale/en.yml @@ -1,4 +1,4 @@ -en-US: +en: activerecord: errors: # The values :model, :attribute and :value are always available for interpolation |