avo 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cff3e9f78fc82e1a9a80221261f1aa29fec6f2efc670d590d8837c5a9224e1af
-  data.tar.gz: fd5fb058686183dd40daeeaf5a112648e4a6162668056ce871ced723a1471fc6
+  metadata.gz: 9baf34b45ec14d817690a0c2a48fc25132b1cce6b80e8b1542b082325d1af656
+  data.tar.gz: f49d287883c66fa87c5ef3cc0be4f307c79ffead8737e25e24bc707ce15d3b2c
 SHA512:
-  metadata.gz: 89b46f1776ec508ca2f11343dfeb77cce80863ffbf984f4535281a22f5fa129721b819abaeca0fc3c83a95121aed822f27ef78abbe43326a13bb6d23b3e175bf
-  data.tar.gz: 18e81a302f60c0eac7717d62e71cb6a18bcceb6108a3b60bacd92ec17b5c2b99fe898453759213abcf52be79d6212f34483697a98ec1b25aaf1ad6cf560359c6
+  metadata.gz: debc97692363a7d08ea51571350fea336c9f5201b343e8d2a15e936dbd99685b7b96fb4b74079348846a650eb177a7a008adb1dbebd61140140bd25acfc54704
+  data.tar.gz: 150853cce487de3315d29a66d8f09b837263c4277e7b86c32cc09951e12824e3ed67e9e1adb1d851ac47730199b1c7355a3a333465d5d48ee941476f56b66551

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (3.5.0)
+    avo (3.5.1)
       actionview (>= 6.1)
       active_link_to
       activerecord (>= 6.1)

data/lib/avo/base_resource.rb

@@ -177,24 +177,27 @@ module Avo
       end
 
       def name
-        default = class_name.underscore.humanize
-
-        if translation_key
-          t(translation_key, count: 1, default: default).humanize
-        else
-          default
-        end
+        name_from_translation_key(count: 1, default: class_name.underscore.humanize)
       end
       alias_method :singular_name, :name
 
       def plural_name
-        default = name.pluralize
-
-        if translation_key
-          t(translation_key, count: 2, default: default).humanize
-        else
-          default
-        end
+        name_from_translation_key(count: 2, default: name.pluralize)
+      end
+
+      # Get the name from the translation_key and fallback to default
+      # It can raise I18n::InvalidPluralizationData when using only resource_translation without pluralization keys like: one, two or other key
+      # Example:
+      # ---
+      # en:
+      #   avo:
+      #     resource_translations:
+      #       product:
+      #         save: "Save product"
+      def name_from_translation_key(count:, default:)
+        t(translation_key, count:, default:).humanize
+      rescue I18n::InvalidPluralizationData
+        default
       end
 
       def underscore_name

data/lib/avo/concerns/has_controls.rb

@@ -16,7 +16,7 @@ module Avo
       end
 
       def render_edit_controls
-        [BackButton.new(label: I18n.t("avo.cancel").capitalize), DeleteButton.new, ActionsList.new, SaveButton.new]
+        [BackButton.new(label: I18n.t("avo.cancel").capitalize), DeleteButton.new, ActionsList.new, SaveButton.new(resource: self)]
       end
 
       def render_index_controls(item:)

data/lib/avo/resources/controls/save_button.rb

@@ -5,7 +5,10 @@ module Avo
         def initialize(**args)
           super(**args)
 
-          @label = args[:label] || I18n.t("avo.save").capitalize
+          @label = args[:label] || I18n.t(
+            "#{args[:resource].translation_key}.save",
+            default: I18n.t("avo.save")
+          ).capitalize
         end
       end
     end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "3.5.0" unless const_defined?(:VERSION)
+  VERSION = "3.5.1" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord