From 3e5f53b0827272da9afe05ed9161e4e97a1fec1a Mon Sep 17 00:00:00 2001
From: Maikel Linke <mkllnk@web.de>
Date: Fri, 11 Mar 2016 12:13:17 +1100
Subject: [PATCH] Rename i18n key what_is_this

---
 app/views/admin/enterprise_groups/_form_images.html.haml | 2 +-
 app/views/admin/enterprise_groups/_form_users.html.haml  | 2 +-
 app/views/spree/admin/orders/bulk_management.html.haml   | 6 ++----
 app/views/spree/admin/overview/_order_cycles.html.haml   | 2 +-
 app/views/spree/admin/overview/_products.html.haml       | 2 +-
 config/locales/en.yml                                    | 3 +--
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/enterprise_groups/_form_images.html.haml b/app/views/admin/enterprise_groups/_form_images.html.haml
index b24feb60a0..67378f331b 100644
--- a/app/views/admin/enterprise_groups/_form_images.html.haml
+++ b/app/views/admin/enterprise_groups/_form_images.html.haml
@@ -14,7 +14,7 @@
       = f.label :promo_image, class: 'with-tip', 'data-powertip' => t(:admin_entreprise_groups_data_powertip_promo_image)
       .with-tip{'data-powertip' => t(:admin_entreprise_groups_data_powertip_promo_image_tip)}
         %a
-          = t 'admin_entreprise_groups_what_s_this'
+          = t 'what_is_this'
       = f.label :promo_image, 'ofn-with-tip' => 'This image is displayed at the top of the Group profile'
       %div{'ofn-with-tip' => 'This image is displayed at the top of the Group profile'}
         %a What's this?
diff --git a/app/views/admin/enterprise_groups/_form_users.html.haml b/app/views/admin/enterprise_groups/_form_users.html.haml
index 4c111c1772..082fa2d3bf 100644
--- a/app/views/admin/enterprise_groups/_form_users.html.haml
+++ b/app/views/admin/enterprise_groups/_form_users.html.haml
@@ -5,7 +5,7 @@
       =f.label :owner_id, t(:admin_entreprise_groups_owner)
       .with-tip{'data-powertip' => t(:admin_entreprise_groups_data_powertip)}
         %a
-          = t 'admin_entreprise_groups_what_s_this'
+          = t 'what_is_this'
       =f.label :owner_id, 'Owner'
       %div{'ofn-with-tip' => "The primary user responsible for this group."}
         %a What's this?
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index 9e9362681d..b0908e0b6e 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -2,12 +2,10 @@
   = "ng-app='admin.lineItems'"
 
 - content_for :page_title do
-  %h1.page-title
-    = t "bulk_order_management"
-  %a{ 'ofn-with-tip' => "#t('bom_tip')" }
-    = t "admin_entreprise_groups_what_s_this"
   %h1.page-title
     = t "bom_page_title"
+  %a{ 'ofn-with-tip' => "#t('bom_tip')" }
+    = t "what_is_this"
 
 = render :partial => 'spree/admin/shared/order_sub_menu'
 
diff --git a/app/views/spree/admin/overview/_order_cycles.html.haml b/app/views/spree/admin/overview/_order_cycles.html.haml
index ae4c9c2c0b..9be7fffed2 100644
--- a/app/views/spree/admin/overview/_order_cycles.html.haml
+++ b/app/views/spree/admin/overview/_order_cycles.html.haml
@@ -7,7 +7,7 @@
         = t "spree_admin_enterprises_create_new"
     - else
       %a.with-tip{ title: t(:spree_admin_order_cycles_tip) }
-        = t "admin_entreprise_groups_what_s_this"
+        = t "what_is_this"
       %a{ "ofn-with-tip" => "Order cycles determine when and where your products are available to customers." } What's this?
   %div.seven.columns.alpha.list
     - if @order_cycle_count > 0
diff --git a/app/views/spree/admin/overview/_products.html.haml b/app/views/spree/admin/overview/_products.html.haml
index a85132bdf3..79da1a0f1b 100644
--- a/app/views/spree/admin/overview/_products.html.haml
+++ b/app/views/spree/admin/overview/_products.html.haml
@@ -7,7 +7,7 @@
         = t "spree_admin_enterprises_create_new"
     - else
       %a{ "ofn-with-tip" => "The products that you sell through the Open Food Network." }
-        = t "admin_entreprise_groups_what_s_this"
+        = t "what_is_this"
   %div.seven.columns.alpha.list
     - if @product_count > 0
       %div.seven.columns.alpha.list-item
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 608bbd86ea..0a2904626d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -789,7 +789,7 @@ Please follow the instructions there to make your enterprise visible on the Open
   on_hand: "On hand"
   save_changes: "Save Changes"
   update_action: "update()" #FIXME
-  admin_entreprise_groups_what_s_this: "What's this ?"
+  what_is_this: "What's this?"
   spree_admin_overview_enterprises_header: "My Enterprises"
   spree_admin_overview_enterprises_footer: "MANAGE MY ENTERPRISES"
   spree_admin_enterprises_hubs_name: "Name"
@@ -831,7 +831,6 @@ Please follow the instructions there to make your enterprise visible on the Open
   manage_products: "Manage products"
   edit_profile_details: "Edit profile details"
   edit_profile_details_etc: "Change your profile description, images, etc."
-  bulk_order_management: "Bulk Order Management"
   start_date: "Start Date"
   end_date: "End Date"
   order_cycle: "Order Cycle"