From 9451f3659c61cf0632ef9ce7066f4740cc1a0115 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Tue, 19 Aug 2014 15:41:01 +1000 Subject: [PATCH] Use pluralize helper, sentence case --- .../overview/_enterprises_hubs_tab.html.haml | 16 ++++++++-------- .../_enterprises_producers_tab.html.haml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml b/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml index 97782817fe..4695f65503 100644 --- a/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml +++ b/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml @@ -12,24 +12,24 @@ %span.symbol.three.columns.centered - payment_method_count = enterprise.payment_methods.count - if payment_method_count < 1 && enterprise.is_distributor - %span.icon-remove-sign.with-tip{ title: "#{enterprise.name} has no Payment Methods" } + %span.icon-remove-sign.with-tip{ title: "#{enterprise.name} has no payment methods" } - elsif enterprise.is_primary_producer - %span.icon-ok-sign.with-tip{ title: "Producers (like #{enterprise.name}) do not require Payment Methods." } + %span.icon-ok-sign.with-tip{ title: "Producers (like #{enterprise.name}) do not require payment methods." } - else - %span.icon-ok-sign.with-tip{ title: "#{payment_method_count} Payment Method#{payment_method_count > 1 ? "s" : ""}" } + %span.icon-ok-sign.with-tip{ title: "#{pluralize payment_method_count, 'payment method'}" } %span.symbol.three.columns.centered - shipping_method_count = enterprise.shipping_methods.count - if shipping_method_count < 1 && enterprise.is_distributor - %span.icon-remove-sign.with-tip{ title: "#{enterprise.name} has no Shipping Methods" } + %span.icon-remove-sign.with-tip{ title: "#{enterprise.name} has no shipping methods" } - elsif enterprise.is_primary_producer - %span.icon-ok-sign.with-tip{ title: "Producers (like #{enterprise.name}) do not require Shipping Methods." } + %span.icon-ok-sign.with-tip{ title: "Producers (like #{enterprise.name}) do not require shipping methods." } -else - %span.icon-ok-sign.with-tip{ title: "#{shipping_method_count} Shipping Method#{shipping_method_count > 1 ? "s" : ""}" } + %span.icon-ok-sign.with-tip{ title: "#{pluralize shipping_method_count, 'shipping method'}" } %span.symbol.three.columns.centered - fee_count = enterprise.enterprise_fees.count - if fee_count > 0 - %span.icon-ok-sign.with-tip{ title: "#{fee_count} Fee#{fee_count > 1 ? "s" : ""}" } + %span.icon-ok-sign.with-tip{ title: "#{pluralize fee_count, 'fee'}" } - else - %span.icon-warning-sign.with-tip{ title: "#{enterprise.name} has no Enterprise Fees" } + %span.icon-warning-sign.with-tip{ title: "#{enterprise.name} has no enterprise fees" } %span.two.columns.omega.right %span.icon-arrow-right diff --git a/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml b/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml index bece8d91e9..4c5cb018e5 100644 --- a/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml +++ b/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml @@ -11,17 +11,17 @@ = enterprise.name %span.symbol.three.columns.centered %span.one.column.alpha   - %span.text-icon.one.column.centered{ class: "#{enterprise.supplied_products.not_deleted.count > 0 ? "green" : "red" }" } + %span.text-icon.one.column.centered{ class: "#{enterprise.supplied_products.not_deleted.any? ? "green" : "red" }" } = enterprise.supplied_products.not_deleted.count %span.one.column.omega   %span.symbol.three.columns.centered %span.one.column.alpha   - %span.text-icon.one.column.centered{ class: "#{enterprise.supplied_and_active_products_on_hand.count > 0 ? "green" : "red" }" } + %span.text-icon.one.column.centered{ class: "#{enterprise.supplied_and_active_products_on_hand.any? ? "green" : "red" }" } = enterprise.supplied_and_active_products_on_hand.count %span.one.column.omega   %span.symbol.three.columns.centered %span.one.column.alpha   - %span.text-icon.one.column.centered{ class: "#{enterprise.active_products_in_order_cycles.count > 0 ? "green" : "orange" }" } + %span.text-icon.one.column.centered{ class: "#{enterprise.active_products_in_order_cycles.any? ? "green" : "orange" }" } = enterprise.active_products_in_order_cycles.count %span.one.column.omega   %span.two.columns.omega.right