From f2fba109f2c31511599888832f80ab0893004825 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Thu, 24 Sep 2015 16:31:25 +0300
Subject: [PATCH] MAGETWO-37891: Not user-friendly message appears if Customer
 moves Product from Shopping Cart to Wishlist

---
 app/code/Magento/Wishlist/Controller/Index/Fromcart.php         | 2 +-
 .../Wishlist/Test/Unit/Controller/Index/FromcartTest.php        | 2 +-
 app/code/Magento/Wishlist/i18n/de_DE.csv                        | 2 +-
 app/code/Magento/Wishlist/i18n/en_US.csv                        | 2 +-
 app/code/Magento/Wishlist/i18n/es_ES.csv                        | 2 +-
 app/code/Magento/Wishlist/i18n/fr_FR.csv                        | 2 +-
 app/code/Magento/Wishlist/i18n/nl_NL.csv                        | 2 +-
 app/code/Magento/Wishlist/i18n/pt_BR.csv                        | 2 +-
 app/code/Magento/Wishlist/i18n/zh_CN.csv                        | 2 +-
 .../Constraint/AssertMoveProductToWishlistSuccessMessage.php    | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
index bcf8b278e2d..8ee09cc1d33 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -105,7 +105,7 @@ class Fromcart extends Action\Action implements IndexInterface
             $wishlist->save();
 
             $this->messageManager->addSuccessMessage(__(
-                "%1 has been moved to your wishlist.",
+                "%1 has been moved to your wish list.",
                 $this->escaper->escapeHtml($item->getProduct()->getName())
             ));
         } catch (LocalizedException $e) {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
index d492dcced8d..58109d6dc3d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
@@ -227,7 +227,7 @@ class FromcartTest extends \PHPUnit_Framework_TestCase
 
         $this->messageManager->expects($this->once())
             ->method('addSuccessMessage')
-            ->with(__("%1 has been moved to your wishlist.", $productName))
+            ->with(__("%1 has been moved to your wish list.", $productName))
             ->willReturnSelf();
 
         $this->resultRedirect->expects($this->once())
diff --git a/app/code/Magento/Wishlist/i18n/de_DE.csv b/app/code/Magento/Wishlist/i18n/de_DE.csv
index 85d040f5d29..23cf75b5751 100644
--- a/app/code/Magento/Wishlist/i18n/de_DE.csv
+++ b/app/code/Magento/Wishlist/i18n/de_DE.csv
@@ -65,7 +65,7 @@ Message,Nachricht
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart","Kann Objekt nicht zum Warenkorb hinzufügen"
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.","E-Mail-Adressfeld darf nicht leer sein."
diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
index fc5976e4740..5bbcbde21a8 100644
--- a/app/code/Magento/Wishlist/i18n/en_US.csv
+++ b/app/code/Magento/Wishlist/i18n/en_US.csv
@@ -65,7 +65,7 @@ Message,Message
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart","Cannot add item to shopping cart"
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.","Email address can't be empty."
diff --git a/app/code/Magento/Wishlist/i18n/es_ES.csv b/app/code/Magento/Wishlist/i18n/es_ES.csv
index 90aa8b117a6..e811032517e 100644
--- a/app/code/Magento/Wishlist/i18n/es_ES.csv
+++ b/app/code/Magento/Wishlist/i18n/es_ES.csv
@@ -65,7 +65,7 @@ Message,Mensaje
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart","No se pudo añadir el artículo al carrito de compra"
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.","El campo Dirección de correo electrónico no puede estar vacío."
diff --git a/app/code/Magento/Wishlist/i18n/fr_FR.csv b/app/code/Magento/Wishlist/i18n/fr_FR.csv
index a1f5b4c198f..23d53490578 100644
--- a/app/code/Magento/Wishlist/i18n/fr_FR.csv
+++ b/app/code/Magento/Wishlist/i18n/fr_FR.csv
@@ -65,7 +65,7 @@ Message,Message
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart","Ne peut ajouter l'article au caddy"
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.","Adresse courriel ne peut être vide."
diff --git a/app/code/Magento/Wishlist/i18n/nl_NL.csv b/app/code/Magento/Wishlist/i18n/nl_NL.csv
index 6cd576421cb..d72bfd19d24 100644
--- a/app/code/Magento/Wishlist/i18n/nl_NL.csv
+++ b/app/code/Magento/Wishlist/i18n/nl_NL.csv
@@ -65,7 +65,7 @@ Message,Boodschap
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart","Kan het item niet toevoegen aan het winkelwagentje"
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.","E-mailadres mag niet leeg zijn."
diff --git a/app/code/Magento/Wishlist/i18n/pt_BR.csv b/app/code/Magento/Wishlist/i18n/pt_BR.csv
index 94f8126a7f8..4c130bd89b6 100644
--- a/app/code/Magento/Wishlist/i18n/pt_BR.csv
+++ b/app/code/Magento/Wishlist/i18n/pt_BR.csv
@@ -65,7 +65,7 @@ Message,Mensagem
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart","Não é possível adicionar item ao carrinho de compras"
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.","O endereço de email não pode ficar vazio."
diff --git a/app/code/Magento/Wishlist/i18n/zh_CN.csv b/app/code/Magento/Wishlist/i18n/zh_CN.csv
index 5279ab788f7..12caf10849a 100644
--- a/app/code/Magento/Wishlist/i18n/zh_CN.csv
+++ b/app/code/Magento/Wishlist/i18n/zh_CN.csv
@@ -65,7 +65,7 @@ Message,信息
 "An error occurred while deleting the item from wish list.","An error occurred while deleting the item from wish list."
 "Cannot add item to shopping cart",无法添加内容到购物车
 "The requested cart item doesn't exist.","The requested cart item doesn't exist."
-"%1 has been moved to your wishlist.","%1 has been moved to your wishlist."
+"%1 has been moved to your wish list.","%1 has been moved to your wish list."
 "We can't move the item to the wish list.","We can't move the item to the wish list."
 "Message length must not exceed %1 symbols","Message length must not exceed %1 symbols"
 "Email address can't be empty.",邮件地址不能为空。
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
index af6d6ebf9a1..88a588fe630 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
@@ -19,7 +19,7 @@ class AssertMoveProductToWishlistSuccessMessage extends AbstractConstraint
     /**
      * Success add message
      */
-    const SUCCESS_MESSAGE = "%s has been moved to your wishlist.";
+    const SUCCESS_MESSAGE = "%s has been moved to your wish list.";
 
     /**
      * Assert that success message appears on My Wish List page after moving product to wishlist.
-- 
GitLab