Use pluralize instead of custom code

openSUSE · Sep 14, 2018 · 27086b3 · 27086b3
1 parent f046371
commit 27086b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/api/app/views/webui/package/show.html.erb b/src/api/app/views/webui/package/show.html.erb
@@ -25,7 +25,7 @@
             <li>
               <%= sprite_tag 'exclamation', title: '' %>
               <%= @failures %>
-              <%= link_to "error#{@failures == 1 ? '' : 's'}", :action => :monitor, :project => @project, :succeeded => 0, :blocked => 0, :finished => 0, :signing => 0, :dispatching => 0, :scheduled => 0, :building => 0, :controller => :project, :pkgname => @package.name %>
+              <%= link_to pluralize(@failures.count,'error'), :action => :monitor, :project => @project, :succeeded => 0, :blocked => 0, :finished => 0, :signing => 0, :dispatching => 0, :scheduled => 0, :building => 0, :controller => :project, :pkgname => @package.name %>
             </li>
         <% end %>
 

diff --git a/src/api/app/views/webui2/webui/package/_show_failures.html.haml b/src/api/app/views/webui2/webui/package/_show_failures.html.haml
@@ -1,6 +1,6 @@
 %li
   %i.fas.fa-times-circle.text-danger{ title: 'Errors' }
   = failures
-  = link_to "error#{failures == 1 ? '' : 's'}", project_monitor_path(project: project, pkgname: package_name, succeeded: 0,
+  = link_to pluralize(errors.count, 'error'), project_monitor_path(project: project, pkgname: package_name, succeeded: 0,
                                                                      blocked: 0, finished: 0, signing: 0, dispatching: 0,
                                                                      scheduled: 0, building: 0)