Permalink
Browse files

Locale file changed to yaml

  • Loading branch information...
1 parent febe2ea commit c1e0d8aa48c2f9139af42b3cf79e42bb5e0f1f03 Iain Hecker committed with Sven Fuchs Aug 19, 2008
@@ -59,7 +59,7 @@
require 'active_support/time_with_zone'
I18n.populate do
- I18n.load_translations File.dirname(__FILE__) + '/active_support/locale/en-US.rb'
+ I18n.load_translations File.dirname(__FILE__) + '/active_support/locale/en-US.yml'
end
Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector')
@@ -1,29 +0,0 @@
-{ :'en-US' => {
- :support => {
- :array => {
- :sentence_connector => 'and'
- }
- },
- :date => {
- :formats => {
- :default => "%Y-%m-%d",
- :short => "%b %d",
- :long => "%B %d, %Y",
- },
- :day_names => Date::DAYNAMES,
- :abbr_day_names => Date::ABBR_DAYNAMES,
- :month_names => Date::MONTHNAMES,
- :abbr_month_names => Date::ABBR_MONTHNAMES,
- :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'
- }
- }
-}
@@ -0,0 +1,31 @@
+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"

0 comments on commit c1e0d8a

Please sign in to comment.