diff options
| author | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-20 09:13:20 +0200 |
|---|---|---|
| committer | Sven Fuchs <svenfuchs@artweb-design.de> | 2008-06-20 09:13:20 +0200 |
| commit | 585c8c17c303fc46fcf014a644a541eae6cb5ffd (patch) | |
| tree | b53e4531f2374e56c10e69a4127054573ad6a17b /actionpack/lib | |
| parent | b09c6e7444cf05f986e601bcc22cf17ede7b63bd (diff) | |
| download | rails-585c8c17c303fc46fcf014a644a541eae6cb5ffd.tar.gz rails-585c8c17c303fc46fcf014a644a541eae6cb5ffd.tar.bz2 rails-585c8c17c303fc46fcf014a644a541eae6cb5ffd.zip | |
rename Backend::Simple#add_translations to set_translations
because it overwrites existing translations
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/form_options_helper.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/lang/en-US.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb index c782c0a816..a6b9e65a77 100644 --- a/actionpack/lib/action_view/helpers/form_options_helper.rb +++ b/actionpack/lib/action_view/helpers/form_options_helper.rb @@ -349,7 +349,7 @@ module ActionView end # All the countries included in the country_options output. - # only included for backwards compatibility, please use the I18n interface + # deprecated. please use :'countries.names'.t directly COUNTRIES = :'countries.names'.t 'en-US' unless const_defined?("COUNTRIES") end diff --git a/actionpack/lib/action_view/lang/en-US.rb b/actionpack/lib/action_view/lang/en-US.rb index 659f96a5f3..70eb1b79de 100644 --- a/actionpack/lib/action_view/lang/en-US.rb +++ b/actionpack/lib/action_view/lang/en-US.rb @@ -1,4 +1,4 @@ -I18n.backend.add_translations :'en-US', { +I18n.backend.set_translations :'en-US', { :date => { :formats => { :default => "%Y-%m-%d", |