aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSergey Pchelincev <jalkoby91@gmail.com>2012-07-18 10:33:14 +0300
committerSergey Pchelincev <jalkoby91@gmail.com>2012-07-18 10:33:14 +0300
commit1b5298e805a7dec4f5b3c465037dec16cbda4156 (patch)
treef0f3ab78c4adabe4c7588c6ee88537268a6d4333 /actionpack/lib
parent58ccc9f6c5d261f7c1305d822b16447ac3d286b3 (diff)
downloadrails-1b5298e805a7dec4f5b3c465037dec16cbda4156.tar.gz
rails-1b5298e805a7dec4f5b3c465037dec16cbda4156.tar.bz2
rails-1b5298e805a7dec4f5b3c465037dec16cbda4156.zip
add lazy look up in abstract controller's translate method
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller/translation.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/translation.rb b/actionpack/lib/abstract_controller/translation.rb
index 6d68cf4944..b6c484d188 100644
--- a/actionpack/lib/abstract_controller/translation.rb
+++ b/actionpack/lib/abstract_controller/translation.rb
@@ -1,6 +1,12 @@
module AbstractController
module Translation
def translate(*args)
+ key = args.first
+ if key.is_a?(String) && (key[0] == '.')
+ key = "#{ controller_path.gsub('/', '.') }.#{ action_name }#{ key }"
+ args[0] = key
+ end
+
I18n.translate(*args)
end
alias :t :translate
@@ -10,4 +16,4 @@ module AbstractController
end
alias :l :localize
end
-end \ No newline at end of file
+end