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 /activesupport/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 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/locale/en.yml (renamed from activesupport/lib/active_support/locale/en-US.yml) | 2 | ||||
| -rwxr-xr-x | activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 202f4ce6ab..d2a7df8bf0 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -58,4 +58,4 @@ require 'active_support/secure_random' require 'active_support/rescuable' -I18n.load_path << File.dirname(__FILE__) + '/active_support/locale/en-US.yml' +I18n.load_path << File.dirname(__FILE__) + '/active_support/locale/en.yml' diff --git a/activesupport/lib/active_support/locale/en-US.yml b/activesupport/lib/active_support/locale/en.yml index c31694b9d6..92132cacd5 100644 --- a/activesupport/lib/active_support/locale/en-US.yml +++ b/activesupport/lib/active_support/locale/en.yml @@ -1,4 +1,4 @@ -en-US: +en: date: formats: # Use the strftime parameters for formats. diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb index 40e82d8225..2ffe3618b5 100755 --- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb +++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb @@ -11,7 +11,7 @@ require 'i18n/exceptions' module I18n @@backend = nil @@load_path = nil - @@default_locale = :'en-US' + @@default_locale = :'en' @@exception_handler = :default_exception_handler class << self @@ -25,7 +25,7 @@ module I18n @@backend = backend end - # Returns the current default locale. Defaults to 'en-US' + # Returns the current default locale. Defaults to 'en' def default_locale @@default_locale end @@ -57,7 +57,7 @@ module I18n # files which are either named *.rb and contain plain Ruby Hashes or are # named *.yml and contain YAML data. So for the SimpleBackend clients may # register translation files like this: - # I18n.load_path << 'path/to/locale/en-US.yml' + # I18n.load_path << 'path/to/locale/en.yml' def load_path @@load_path ||= [] end |