github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-27 07:17:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'iain' into i18n

Browse Source
This commit is contained in:
Sven Fuchs
2008-08-20 18:44:41 +02:00
parent fc0358ae16 950b9792ba
commit c324ef2785
10 changed files with 159 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_view.rb
View File

@@ -35,7 +35,7 @@ require 'action_view/partials'
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

89
actionpack/lib/action_view/locale/en-US.rb
View File

@@ -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:"
}
}
}
}
}

91
actionpack/lib/action_view/locale/en-US.yml Normal file
View File

@@ -0,0 +1,91 @@
"en-US":
number:
# Used in number_with_delimiter()
# These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
format:
# Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
separator: "."
# Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
delimiter: ","
# Number of decimals, behind the separator (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
separator: "."
delimiter: ","
precision: 2
# Used in number_to_percentage()
percentage:
format:
# These three are to override number.format and are optional
# separator:
delimiter: ""
# precision:
# Used in number_to_precision()
precision:
format:
# These three are to override number.format and are optional
# separator:
delimiter: ""
# precision:
# Used in number_to_human_size()
human:
format:
# These three are to override number.format and are optional
# separator:
delimiter: ""
precision: 1
# 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 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"
activerecord:
errors:
template:
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
body: "There were problems with the following fields:"

2
activerecord/lib/active_record.rb
View File

@@ -82,6 +82,6 @@ require 'active_record/connection_adapters/abstract_adapter'
require 'active_record/schema_dumper'
I18n.backend.populate do
I18n.load_translations File.dirname(__FILE__) + '/active_record/locale/en-US.rb'
I18n.load_translations File.dirname(__FILE__) + '/active_record/locale/en-US.yml'
end

28
activerecord/lib/active_record/locale/en-US.rb
View File

@@ -1,28 +0,0 @@
{ :'en-US' => {
:activerecord => {
:errors => {
:messages => {
:inclusion => "is not included in the list",
:exclusion => "is reserved",
:invalid => "is invalid",
:confirmation => "doesn't match confirmation",
:accepted => "must be accepted",
:empty => "can't be empty",
:blank => "can't be blank",
:too_long => "is too long (maximum is {{count}} characters)",
:too_short => "is too short (minimum is {{count}} characters)",
:wrong_length => "is the wrong length (should be {{count}} characters)",
:taken => "has already been taken",
:not_a_number => "is not a number",
:greater_than => "must be greater than {{count}}",
:greater_than_or_equal_to => "must be greater than or equal to {{count}}",
:equal_to => "must be equal to {{count}}",
:less_than => "must be less than {{count}}",
:less_than_or_equal_to => "must be less than or equal to {{count}}",
:odd => "must be odd",
:even => "must be even"
}
}
}
}
}

33
activerecord/lib/active_record/locale/en-US.yml Normal file
View File

@@ -0,0 +1,33 @@
en-US:
activerecord:
errors:
# The values :model, :attribute and :value are always available for interpolation
# The value :count is available when applicable. Can be used for pluralization.
messages:
inclusion: "is not included in the list"
exclusion: "is reserved"
invalid: "is invalid"
confirmation: "doesn't match confirmation"
accepted: "must be accepted"
empty: "can't be empty"
blank: "can't be blank"
too_long: "is too long (maximum is {{count}} characters)"
too_short: "is too short (minimum is {{count}} characters)"
wrong_length: "is the wrong length (should be {{count}} characters)"
taken: "has already been taken"
not_a_number: "is not a number"
greater_than: "must be greater than {{count}}"
greater_than_or_equal_to: "must be greater than or equal to {{count}}"
equal_to: "must be equal to {{count}}"
less_than: "must be less than {{count}}"
less_than_or_equal_to: "must be less than or equal to {{count}}"
odd: "must be odd"
even: "must be even"
# Append your own errors here or at the model/attributes scope.
models:
# Overrides default messages
attributes:
# Overrides model and default messages.

2
activerecord/test/cases/validations_i18n_test.rb
View File

@@ -11,7 +11,7 @@ class ActiveRecordValidationsI18nTests < Test::Unit::TestCase
def teardown
reset_callbacks Topic
I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.rb'
I18n.load_translations File.dirname(__FILE__) + '/../../lib/active_record/locale/en-US.yml'
end
def unique_topic

2
activesupport/lib/active_support.rb
View File

@@ -59,7 +59,7 @@ require 'active_support/base64'
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')

29
activesupport/lib/active_support/locale/en-US.rb
View File

@@ -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'
}
}
}

31
activesupport/lib/active_support/locale/en-US.yml Normal file
View File

@@ -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"