improve names and callback

davydovanton · Aug 7, 2019 · 15dd98b · 15dd98b
1 parent 98260d0
commit 15dd98b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/sidekiq/statistic/locales/pt-br.yml b/lib/sidekiq/statistic/locales/pt-br.yml
@@ -29,6 +29,6 @@ pt-br: # <---- change this to your locale code
   SearchLogs: Pesquisar no arquivo de logs
   date:
     formats:
-      withoutTime: "%d/%m/%Y"
-      withTime: "%d/%m/%Y - %T"
+      default: "%d/%m/%Y"
+      datetime: "%d/%m/%Y - %T"
 
diff --git a/lib/sidekiq/statistic/views/statistic.erb b/lib/sidekiq/statistic/views/statistic.erb
@@ -46,7 +46,7 @@
             <td class="worker">
               <a href="<%= root_path %>statistic/<%= worker[:name] %>"><%= worker[:name] %></a>
             </td>
-            <td class="worker"><%= format_date worker[:runtime][:last], 'withTime' %></td>
+            <td class="worker"><%= format_date worker[:runtime][:last], 'datetime' %></td>
             <td class="worker"><%= worker[:queue] %></td>
             <td class="worker"><%= worker[:number_of_calls][:success] %></td>
             <td class="worker"><%= worker[:number_of_calls][:failure] %></td>

diff --git a/lib/sidekiq/statistic/views/worker.erb b/lib/sidekiq/statistic/views/worker.erb
@@ -36,8 +36,8 @@
           </thead>
           <% @worker_statistic.each do |worker| %>
             <tr>
-              <td class="worker"><%= format_date worker[:date], 'withoutTime' %></td>
-              <td class="worker"><%= format_date worker[:runtime][:last], 'withTime' %></td>
+              <td class="worker"><%= format_date worker[:date] %></td>
+              <td class="worker"><%= format_date worker[:runtime][:last], 'datetime' %></td>
               <td class="worker"><%= worker[:success] %></td>
               <td class="worker"><%= worker[:failure] %></td>
               <td class="worker"><%= worker[:total] %></td>

diff --git a/lib/sidekiq/statistic/web_extension_helper.rb b/lib/sidekiq/statistic/web_extension_helper.rb
@@ -25,7 +25,7 @@ def calculate_date_range(params)
       private
 
       def date_format(format)
-        get_locale.dig('date', 'formats', format) || '%m/%e/%Y - %T'
+        get_locale.dig('date', 'formats', format || 'default') || '%m/%d/%Y'
       end
 
       def convert_to_date_object(date)