lib/selectable_attr/enum.rb in selectable_attr-0.3.14 vs lib/selectable_attr/enum.rb in selectable_attr-0.3.15

@@ -103,11 +103,11 @@
     end
 
     def to_hash_array
       entries.map do |entry|
         result = entry.to_hash
-        yield(result) if defined? yield
+        yield(result) if block_given?
         result
       end
     end
 
     def length
@@ -126,10 +126,14 @@
         @name = name
         @options = options
         self.instance_eval(&block) if block
       end
 
-      attr_reader :name
+      def name
+        I18n.locale.nil? ? @name :
+          @enum.i18n_scope.nil? ? @name :
+          I18n.translate(key, :scope => @enum.i18n_scope, :default => @name)
+      end
 
       def [](option_key)
         BASE_ATTRS.include?(option_key) ? send(option_key) :
         @options ? @options[option_key] : nil
       end