Permalink
Browse files

Changed locale file to yml for actionpack, but still broken

  • Loading branch information...
1 parent 7236639 commit 7ee01c8c5415579a68fe4bf073f69cf5796bf7c9 Iain Hecker committed with Sven Fuchs Aug 19, 2008
@@ -35,7 +35,7 @@
require 'action_view/template_error'
I18n.backend.populate do
- I18n.load_translations File.dirname(__FILE__) + '/action_view/locale/en-US.rb'
+ I18n.load_translations File.dirname(__FILE__) + '/action_view/locale/en-US.yml'
end
ActionView::Base.class_eval do
@@ -1,89 +0,0 @@
-{ :'en-US' => {
- :datetime => {
- :distance_in_words => {
- :half_a_minute => 'half a minute',
- :less_than_x_seconds => {
- :one => 'less than 1 second',
- :many => 'less than {{count}} seconds'
- },
- :x_seconds => {
- :one => '1 second',
- :many => '{{count}} seconds'
- },
- :less_than_x_minutes => {
- :one => 'less than a minute',
- :many => 'less than {{count}} minutes'
- },
- :x_minutes => {
- :one => '1 minute',
- :many => '{{count}} minutes'
- },
- :about_x_hours => {
- :one => 'about 1 hour',
- :many => 'about {{count}} hours'
- },
- :x_days => {
- :one => '1 day',
- :many => '{{count}} days'
- },
- :about_x_months => {
- :one => 'about 1 month',
- :many => 'about {{count}} months'
- },
- :x_months => {
- :one => '1 month',
- :many => '{{count}} months'
- },
- :about_x_years => {
- :one => 'about 1 year',
- :many => 'about {{count}} years'
- },
- :over_x_years => {
- :one => 'over 1 year',
- :many => 'over {{count}} years'
- }
- }
- },
- :number => {
- :format => {
- :precision => 3,
- :separator => '.',
- :delimiter => ','
- },
- :currency => {
- :format => {
- :unit => '$',
- :precision => 2,
- :format => '%u%n'
- }
- },
- :human => {
- :format => {
- :precision => 1,
- :delimiter => ''
- }
- },
- :percentage => {
- :format => {
- :delimiter => ''
- }
- },
- :precision => {
- :format => {
- :delimiter => ''
- }
- }
- },
- :activerecord => {
- :errors => {
- :template => {
- :header => {
- :one => "1 error prohibited this {{model}} from being saved",
- :many => "{{count}} errors prohibited this {{model}} from being saved"
- },
- :body => "There were problems with the following fields:"
- }
- }
- }
- }
-}
@@ -0,0 +1,89 @@
+"en-US":
+ number:
+ # Used in number_with_delimiter()
+ # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+ format:
+ # Sets the seperator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+ seperator: "."
+ # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+ delimeter: ","
+ # Number of decimals, behind the seperator (the number 1 with a precision of 2 gives: 1.00)
+ precision: 3
+
+ # Used in number_to_currency()
+ currency:
+ format:
+ # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+ format: "%u%n"
+ unit: "$"
+ # These three are to override number.format and are optional
+ seperator: "."
+ delimiter: ","
+ precision: 2
+
+ # Used in number_to_percentage()
+ percentage:
+ format:
+ # These three are to override number.format and are optional
+ seperator: "."
+ delimiter: ","
+ precision: 3
+
+ # Used in number_to_precision()
+ precision:
+ format:
+ # These three are to override number.format and are optional
+ seperator: "."
+ delimiter: ","
+ precision: 3
+
+ # Used in number_to_human_size()
+ human:
+ format:
+ # These three are to override number.format and are optional
+ seperator: "."
+ delimiter: ","
+
+ # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+ datetime:
+ distance_in_words:
+ half_a_minute: "half a minute"
+ less_than_x_seconds:
+ one: "less than a second"
+ many: "less than {{count}} seconds"
+ x_seconds:
+ one: "1 second"
+ many: "{{count}} seconds"
+ less_than_x_minutes:
+ one: "less than 1 minutes"
+ many: "less than {{count}} minutes"
+ x_minutes:
+ one: "1 minute"
+ many: "{{count}} minutes"
+ about_x_hours:
+ one: "about 1 hour"
+ many: "about {{count}} hours"
+ x_days:
+ one: "1 day"
+ many: "{{count}} days"
+ about_x_months:
+ one: "about a month"
+ many: "about {{count}} months"
+ x_months:
+ one: "1 month"
+ many: "{{count}} months"
+ about_x_years:
+ one: "about 1 year"
+ many: "about {{count}} years"
+ over_x_years:
+ one: "over 1 year"
+ many: "over {{count}} years"
+
+ activerecord:
+ errors:
+ header:
+ one: "1 error prohibited this {{model}} from being saved"
+ many: "{{count}} errors prohibited this {{model}} from being saved"
+ # The variable :count is also available
+ message: "There were problems with the following fields:"
+

0 comments on commit 7ee01c8

Please sign in to comment.