aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/locale
diff options
context:
space:
mode:
authorSven Fuchs <svenfuchs@artweb-design.de>2008-11-18 09:59:46 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-18 14:23:53 +0100
commit12118963acacc9c869bdd41ef8480a1a4e06d358 (patch)
treef08b102f58bcf9d3b87e1dab97d6f62f5c844b69 /activesupport/lib/active_support/locale
parentd9b92ee11b33fed5c7a94a91415fa846705f7dd3 (diff)
downloadrails-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/active_support/locale')
-rw-r--r--activesupport/lib/active_support/locale/en.yml (renamed from activesupport/lib/active_support/locale/en-US.yml)2
1 files changed, 1 insertions, 1 deletions
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.