aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/vendor
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/vendor')
-rwxr-xr-xactivesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb6
1 files changed, 3 insertions, 3 deletions
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