object_attorney 0.0.14 → 0.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTExZGJiODQ3MjYzZmFhOWY3YjAxMDk1OTc1ZWMyYzhkOTJhMWUzZA==
+    YzYwNjRlODU3YjdhMGJhMDRmZjA3M2NmODRhZDBlZjAyYjIyMTIwNA==
   data.tar.gz: !binary |-
-    ZGM3YTFmN2FmMjE1NDg5MWM1N2VjZGQ5NzU5NzE1OTQ4MjZlNzI2YQ==
+    ZDg3YTQ2ZjYyM2JmNjIwNzI2OTA5YTFhNjZkM2Y4MWUwYmQzOWI0YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmYwOTExOTEyMDQ1YmJjNjBjMDA0NTYxYjY0ZDVlNTBiNzU3MzgxNTU1NzMw
-    MjMwYmZmNjNlNDVhNTllODgwYzAzYTI2ZGI4MmUyOGQ4ZTQ3N2IxYjgwYWVl
-    MmEzNGMwNzZhODY2ZGU1ZGUwNzNkZTQzZjNiMTVhOTAwM2U1ZTE=
+    NjEyNGU5YWRiMTYxY2MxOGY0OWIwZGEyOGRlZWI0M2UzN2FhN2NmNTY5ZDkw
+    ZDYyY2ZkOWM3YTAzM2FiYzBlMTI0MmNiMjVmOGI5YmQ0MjZiY2VlZjE5Yjc3
+    YzZlYTNhNzIzNmQxMGVlOWY3ZmQ0MjIzMjM4ODQzNjY4NzEyZTY=
   data.tar.gz: !binary |-
-    YWE1OTNiMjA2NjFkMWVkYzhmZTkwOGZkYWEzYjQ0NWRmYzJjZmY5ZmYyNzRl
-    NmNjZjQ1ODhiMzIwZGVhNDQ2ZGMzYmNmNDI2ZWI0ZWRkMTc2NjE5ODRhMjMy
-    ZjBlODdkODlkMmE1ZWVhNDNlZjIxZjQwNDIyNTgwZGI4MGJhOTE=
+    MDA4NTdkNzRlZTBlZDMyYWRkNjRiODJjMzNmOWU1OTI2MzZmMGFjYWFlNWFk
+    MzUwMGNjMjNhZDczMGJlMzJkMjg0MDllYzQzYTkzMWVmYmIyODc5NGViNDdi
+    N2ExNDMzNGZiNzkzMDY2NjE0ZTFiMDZlYTlhZjc1NTk2ZDEyNGU=

data/lib/object_attorney.rb

@@ -123,18 +123,21 @@ module ObjectAttorney
     end
 
     def human_attribute_name(attribute_key_name, options = {})
-      if represented_object_class.respond_to?(:human_attribute_name)
-        represented_object_class.human_attribute_name(attribute_key_name, options)
-      else
-        defaults = []
-        defaults << "#{represented_object_class.name.underscore}.#{attribute_key_name}" if represented_object_class.present?
-        defaults << "#{name.underscore}.#{attribute_key_name}"
-        defaults << options[:default] if options[:default]
-        defaults.flatten!
-        defaults << attribute_key_name.to_s.humanize
-        options[:count] ||= 1
-        I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => [:activerecord, :attributes]))
+      no_translation = "-- no translation --"
+
+      defaults = ["object_attorney.attributes.#{name.underscore}.#{attribute_key_name}".to_sym]
+      defaults << options[:default] if options[:default]
+      defaults.flatten!
+      defaults << no_translation
+      options[:count] ||= 1
+      
+      translation = I18n.translate(defaults.shift, options.merge(default: defaults))
+
+      if translation == no_translation && represented_object_class.respond_to?(:human_attribute_name)
+        translation = represented_object_class.human_attribute_name(attribute_key_name, options)
       end
+
+      translation
     end
 
     def model_name

data/lib/object_attorney/version.rb

@@ -1,3 +1,3 @@
 module ObjectAttorney
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object_attorney
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler