diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-09 11:58:57 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-09 11:58:57 -0800 |
| commit | c74cddc9197d03ca641bf35d102199cabf1b9866 (patch) | |
| tree | 64afc3b79850f6ccde96b9a1ac6d80c4c74a51d1 /actionpack/lib/action_controller | |
| parent | 4a1f43878105d701fd2dd769ec3cf7e81d133c09 (diff) | |
| parent | 17dee01b6f2186888629859fe2e99232225ae5ea (diff) | |
| download | rails-c74cddc9197d03ca641bf35d102199cabf1b9866.tar.gz rails-c74cddc9197d03ca641bf35d102199cabf1b9866.tar.bz2 rails-c74cddc9197d03ca641bf35d102199cabf1b9866.zip | |
Merge commit 'brynary/fix-master-warnings'
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/translation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/translation.rb b/actionpack/lib/action_controller/translation.rb index 9bb63cdb15..65e9eddb0a 100644 --- a/actionpack/lib/action_controller/translation.rb +++ b/actionpack/lib/action_controller/translation.rb @@ -1,12 +1,12 @@ module ActionController module Translation def translate(*args) - I18n.translate *args + I18n.translate(*args) end alias :t :translate def localize(*args) - I18n.localize *args + I18n.localize(*args) end alias :l :localize end |