diff options
author | José Valim and Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-21 11:42:22 +1100 |
---|---|---|
committer | José Valim and Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-21 11:42:22 +1100 |
commit | fbdbac2b88218e5e3e6087c67dacf7e755aa4106 (patch) | |
tree | 6fdec21b56ab90fc2ec83cbc38033439a9c84e74 /actionpack/lib/action_controller/translation.rb | |
parent | d3da87ce771845f99bbdc04d6d6587b22655b063 (diff) | |
parent | fa9f000246c2f6010f18bf40237d105b782873e2 (diff) | |
download | rails-fbdbac2b88218e5e3e6087c67dacf7e755aa4106.tar.gz rails-fbdbac2b88218e5e3e6087c67dacf7e755aa4106.tar.bz2 rails-fbdbac2b88218e5e3e6087c67dacf7e755aa4106.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/translation.rb')
-rw-r--r-- | actionpack/lib/action_controller/translation.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/translation.rb b/actionpack/lib/action_controller/translation.rb deleted file mode 100644 index 65e9eddb0a..0000000000 --- a/actionpack/lib/action_controller/translation.rb +++ /dev/null @@ -1,13 +0,0 @@ -module ActionController - module Translation - def translate(*args) - I18n.translate(*args) - end - alias :t :translate - - def localize(*args) - I18n.localize(*args) - end - alias :l :localize - end -end
\ No newline at end of file |