smooth_operator 1.10.17 → 1.10.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmU3ZWY3OGVjOTg5NTNmMGNiMTI4N2U5YTAyYjQzOGI1MGQ4NjNhMQ==
+    YmQ3ZWNiNWFhZGZiNWYyOGJiZmQ5Y2VlNjEyNTc4MzRlYzNiMzE2MA==
   data.tar.gz: !binary |-
-    NWY2YWE5NmVmZjM4YzBlNTRhZGJmMjVlODM3M2QxY2ViZDRmMmNmMg==
+    MWVlNzhiNWZhNjFlYWJlY2Q3YzY3MDM2NTZmYmJkZGMwMGM3YzIyZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTAxMGQ5YWU1MTFkNzE5OTliZTY0YjU4ZWZiNTVhM2E0Zjg3ODVjZDIzM2Fh
-    NzhmN2FlZmEzM2I4NGJjYTM0ZTUzZGYwZmQ3YWJkODdiNDRkMjJiY2YyNjgz
-    MzNmNmM4OWJlOThlYjM4ZjlmYzVkODIzNDNkNWIzMDcxOTFhNzM=
+    OThjMTlhZTA3MmY1ZDNjZjZmZTRiNmZiMDZlZDgxOTVhMGM0YzFlNTBiZTMw
+    MzBmNzZhOWI4NDgyYTBlZWFkNzUxNDUyNjA4MjQ4NjE2MzU0OTkwN2ViN2Uy
+    MDIwMDM4YzRiNmJiOTEyMjgxMDE5MTRjODJkMmRjN2I3NWMxYmM=
   data.tar.gz: !binary |-
-    MDZiOTJjNmQ1ZTVjNzZmZTc0MWI3MTU5NjBmYTU0ZTY3ZTBhNmUxY2NkZDg2
-    OTk5MzVhNDhmYTBhNTlhYWE0NmFiNmM1MTAyMGM0ZDMxM2VmZTUzZmU2YjE0
-    ZWI0MzBiMDI5MDVkZWRlYjUzNmMwMTMyNDk0OWQxMzk4MzM0MTA=
+    NmFiNjRhYzkxNWQ4ZTFkOTM0OGEyMTUzZjE3ZjE2ZjNmMTdjNzE5OGRjYjBi
+    MDM5NGZmYTIxMGUyOGFkMGIyYWRhZTcyNzY0MWNmZDhjZWU4NjY5ZTUzMTlh
+    OGNiNTRjZDQyZGZmZWI3YWQxZTgzZTZlY2M2MDM5YWY2MjgxZGI=

data/lib/smooth_operator/model_schema.rb

@@ -71,7 +71,10 @@ module SmoothOperator
           namespace ||= self.parents.detect do |n|
             n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
           end
-          ActiveModel::Name.new(self, namespace, @_model_name)
+
+          ActiveModel::Name.new(self, namespace, @_model_name).tap do |model_name|
+            def model_name.human(options = {}); @klass.send(:_translate, "models.#{i18n_key}", options); end
+          end
         end
       end
 

data/lib/smooth_operator/translation.rb

@@ -3,16 +3,23 @@ module SmoothOperator
   module Translation
 
     def human_attribute_name(attribute_key_name, options = {})
+      _translate("attributes.#{model_name.i18n_key}.#{attribute_key_name}", options = {})
+    end
+
+
+    private ###################### PRIVATE #########################
+
+    def _translate(namespace = '', options = {})
       no_translation = "-- no translation --"
       
-      defaults = ["smooth_operator.attributes.#{model_name.i18n_key}.#{attribute_key_name}".to_sym]
-      defaults << "activerecord.attributes.#{model_name.i18n_key}.#{attribute_key_name}".to_sym
+      defaults = ["smooth_operator.#{namespace}".to_sym]
+      defaults << "activerecord.#{namespace}".to_sym
       defaults << options[:default] if options[:default]
       defaults.flatten!
       defaults << no_translation
-      options[:count] ||= 1
       
-      I18n.translate(defaults.shift, options.merge(default: defaults))
+      options = { count: 1, default: defaults }.merge!(options.except(:default))
+      I18n.translate(defaults.shift, options)
     end
 
   end

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.10.17"
+  VERSION = "1.10.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.10.17
+  version: 1.10.18
 platform: ruby
 authors:
 - João Gonçalves