aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model/translation.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-01 18:31:33 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-01 18:31:33 -0700
commitb3a74a14a3d6efa22a07116c4cb26aadc479fb41 (patch)
treef5e7fe3933183c796cf82d2bada32417eb0b65e8 /activemodel/lib/active_model/translation.rb
parentdd1f36078eff18721eed76d236796c8d26d81e58 (diff)
parenteebb9ddf9ba559a510975c486fe59a4edc9da97d (diff)
downloadrails-b3a74a14a3d6efa22a07116c4cb26aadc479fb41.tar.gz
rails-b3a74a14a3d6efa22a07116c4cb26aadc479fb41.tar.bz2
rails-b3a74a14a3d6efa22a07116c4cb26aadc479fb41.zip
Merge pull request #10408 from patricksrobertson/convert_activemodel_to_new_hash_syntax
Convert ActiveModel to 1.9 hash syntax.
Diffstat (limited to 'activemodel/lib/active_model/translation.rb')
-rw-r--r--activemodel/lib/active_model/translation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index 0d098ba93d..8470915abb 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -41,7 +41,7 @@ module ActiveModel
#
# Specify +options+ with additional translating options.
def human_attribute_name(attribute, options = {})
- options = { :count => 1 }.merge!(options)
+ options = { count: 1 }.merge!(options)
parts = attribute.to_s.split(".")
attribute = parts.pop
namespace = parts.join("/") unless parts.empty?