jav_madmin 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d91356c371216c4e08343abcd8e7c4d3a882bc1e1993c771d538e0b0043f0f
-  data.tar.gz: 651a12e2e8630370b245eccee8d971aab0defc877901d80e0054d2bd094330d6
+  metadata.gz: bdca12e732cb02bb6a5627f86c80dfc392990e96f6e3170af55981ae3de3d247
+  data.tar.gz: 6725ea9f24078be1a59d0fd7c003c261bdd5f21d60d033a2f7d21d3849841176
 SHA512:
-  metadata.gz: 0722c8fdb86a609e163a64badc2d699be91cd68603d8bd2f7bf24fd40b1f223a1f5838e47bd3a514d77d5b7fe6be921976ac9fd7e09d980fdbcb390d04538ef5
-  data.tar.gz: 71cd257d6d538a7e858eb5d582a92558b8e1769e378e2008de169774559dee841c54f0cc926a6532eac4c174bb6110f71bd287a51f2ec920e2f2ca99a8b7059a
+  metadata.gz: c0b6000f7c185be369897bfb77396424e44f1492fe499e8ad52d89a1fc6b6d81317a3b3c8afba26c96b8367f20ea1682d63287e8d630c8492e3f7e1757d2cb22
+  data.tar.gz: 352f7789b1edff23e396b35ac69f8abf9b4ccd4d7737493df6f519ccab621f77a1919761d4bab23431c2a9fe237385b96414e560c9e3af4b03aeb21a62d1e922

data/app/helpers/madmin/nav_helper.rb

@@ -27,13 +27,4 @@ module Madmin::NavHelper
 
     link_to name, url, html_options
   end
-
-  # label default is model i18n_key, is a Symbol
-  def menu_label(label)
-    if label.is_a?(Symbol)
-      I18n.t("activerecord.models.#{label}", count: 2, default: [:"madmin.navigation.#{label}", label.to_s.pluralize(I18n.locale).titleize])
-    else
-      label
-    end
-  end
 end

data/app/views/madmin/application/_navigation.html.erb

@@ -3,13 +3,13 @@
 
   <% Madmin.menu.render do |item| %>
     <% if item.url %>
-      <%= nav_link_to menu_label(item.label), item.url, starts_with: item.url %>
+      <%= nav_link_to item.human_label, item.url, starts_with: item.url %>
     <% else %>
-      <h4><%= menu_label(item.label) %></h4>
+      <h4><%= item.human_label %></h4>
     <% end %>
 
     <% item.items.each do |item| %>
-      <%= nav_link_to menu_label(item.label), item.url, starts_with: item.url %>
+      <%= nav_link_to item.human_label, item.url, starts_with: item.url %>
     <% end %>
   <% end %>
 </nav>

data/app/views/madmin/application/edit.html.erb

@@ -2,7 +2,7 @@
 
 <header class="header">
   <h1>
-    <%= link_to resource.friendly_name(count: 2, default: resource.model_name.pluralize(I18n.locale)), resource.index_path %>
+    <%= link_to resource.friendly_name(count: 2), resource.index_path %>
     /
     <strong><%= t("madmin.actions.edit") %> <%= link_to resource.display_name(@record), resource.show_path(@record) %></strong>
   </h1>

data/app/views/madmin/application/index.html.erb

@@ -1,7 +1,7 @@
-<%= content_for :title, resource.friendly_name(count: 2, default: resource.model_name.pluralize(I18n.locale)) %>
+<%= content_for :title, resource.friendly_name(count: 2) %>
 
 <header class="header">
-  <h1><%= resource.friendly_name(count: 2, default: resource.model_name.pluralize(I18n.locale)) %></h1>
+  <h1><%= resource.friendly_name(count: 2) %></h1>
 
   <div class="actions">
     <form class="search">

data/app/views/madmin/application/new.html.erb

@@ -2,7 +2,7 @@
 
 <header class="header">
   <h1>
-    <%= link_to resource.friendly_name(count: 2, default: resource.model_name.pluralize(I18n.locale)) , resource.index_path %>
+    <%= link_to resource.friendly_name(count: 2) , resource.index_path %>
     /
     <strong><%= t("madmin.titles.new", name: resource.friendly_name) %></strong>
   </h1>

data/app/views/madmin/application/show.html.erb

@@ -2,7 +2,7 @@
 
 <header class="header">
   <h1>
-    <%= link_to resource.friendly_name(count: 2, default: resource.model_name.pluralize(I18n.locale)), resource.index_path %>
+    <%= link_to resource.friendly_name(count: 2), resource.index_path %>
     /
     <%= resource.display_name(@record) %>
   </h1>

data/lib/madmin/menu.rb

@@ -44,7 +44,7 @@ module Madmin
       def items
         @children.values.sort do |a, b|
           result = a.position <=> b.position
-          result = a.label.to_s <=> b.label.to_s if result == 0 # sort alphabetically for the same position
+          result = a.human_label <=> b.human_label if result == 0 # sort alphabetically for the same position
           result
         end
       end
@@ -65,6 +65,14 @@ module Madmin
         @if = options.delete(:if)
         @children = {}
       end
+
+      def human_label
+        @human_label ||= if label.is_a?(Symbol)
+          I18n.t("activerecord.models.#{label}", count: 2, default: [:"madmin.navigation.#{label}", label.to_s.pluralize(I18n.locale).titleize])
+        else
+          label
+        end
+      end
     end
   end
 end

data/lib/madmin/resource.rb

@@ -83,8 +83,8 @@ module Madmin
 
       # Returns singular name
       # For example: "Forum::Post" -> "Post"
-      def friendly_name(count: 1, default: nil)
-        model.model_name.human(count: count, default: default)
+      def friendly_name(count: 1)
+        model.model_name.human(count: count, default: model_name.titleize.pluralize(count, I18n.locale))
       end
 
       # Support for isolated namespaces

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "2.6.4"
+  VERSION = "2.6.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jav_madmin
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Chris Oliver