aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/locale/en-US.yml
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/en-US.yml
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/en-US.yml')
-rw-r--r--activesupport/lib/active_support/locale/en-US.yml32
1 files changed, 0 insertions, 32 deletions
diff --git a/activesupport/lib/active_support/locale/en-US.yml b/activesupport/lib/active_support/locale/en-US.yml
deleted file mode 100644
index c31694b9d6..0000000000
--- a/activesupport/lib/active_support/locale/en-US.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-en-US:
- date:
- formats:
- # Use the strftime parameters for formats.
- # When no format has been given, it uses default.
- # You can provide other formats here if you like!
- default: "%Y-%m-%d"
- short: "%b %d"
- long: "%B %d, %Y"
-
- day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
- abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-
- # Don't forget the nil at the beginning; there's no such thing as a 0th month
- month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
- abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
- # Used in date_select and datime_select.
- order: [ :year, :month, :day ]
-
- time:
- formats:
- default: "%a, %d %b %Y %H:%M:%S %z"
- short: "%d %b %H:%M"
- long: "%B %d, %Y %H:%M"
- am: "am"
- pm: "pm"
-
-# Used in array.to_sentence.
- support:
- array:
- sentence_connector: "and"
- skip_last_comma: false