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 /activesupport/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 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/lang/en-US.rb | 2 | ||||
| m--------- | activesupport/lib/active_support/vendor/i18n-0.0.1 | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/lang/en-US.rb b/activesupport/lib/active_support/lang/en-US.rb index 8732927f48..5b8e04363e 100644 --- a/activesupport/lib/active_support/lang/en-US.rb +++ b/activesupport/lib/active_support/lang/en-US.rb @@ -1,4 +1,4 @@ -I18n.backend.add_translations :'en-US', { +I18n.backend.set_translations :'en-US', { :support => { :array => { :sentence_connector => 'and' diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1 b/activesupport/lib/active_support/vendor/i18n-0.0.1 -Subproject 70ab0f3cc5921cc67e09741939a08b2582d707c +Subproject 1af3435539b4a0729c13d21c5df037a635fe98c |