From 9723c8b82bfc1e8aca25160092317ebd93ce9c43 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 19 Jul 2017 10:14:28 +1000 Subject: [PATCH] Move translation into the right place The dashboard couldn't find a translation, because it is in the spree namespace. Also simplified the translation using the `count` feature. --- .../spree/admin/overview/_order_cycles.html.haml | 2 +- config/locales/en.yml | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/spree/admin/overview/_order_cycles.html.haml b/app/views/spree/admin/overview/_order_cycles.html.haml index 752a22febd..a6c1310578 100644 --- a/app/views/spree/admin/overview/_order_cycles.html.haml +++ b/app/views/spree/admin/overview/_order_cycles.html.haml @@ -12,7 +12,7 @@ - if @order_cycle_count > 0 %div.seven.columns.alpha.list-item %span.six.columns.alpha - = t('.you_have_active', num: @order_cycle_count, order_cycles: t('.order_cycle', count: @order_cycle_count)) + = t('.you_have_active', count: @order_cycle_count) %span.one.column.omega %span.icon-ok-sign %a.seven.columns.alpha.button.bottom.blue{ href: "#{main_app.admin_order_cycles_path}" } diff --git a/config/locales/en.yml b/config/locales/en.yml index 029806d38a..e487bd2293 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -647,11 +647,6 @@ en: has_no_enterprise_fees: "%{enterprise} has no enterprise fees" order_cycles: manage_order_cycles: MANAGE ORDER CYCLES - you_have_active: "You have %{num} active %{order_cycles}." - order_cycle: - zero: order cycle - one: order cycle - other: order cycles enterprise_issues: create_new: Create New resend_email: Resend Email @@ -2052,6 +2047,12 @@ Please follow the instructions there to make your enterprise visible on the Open form: distribution_fields: title: Distribution + overview: + order_cycles: + you_have_active: + zero: "You have no active order cycles." + one: "You have one active order cycle." + other: "You have %{count} active order cycles." products: bulk_edit: header: