Merge pull request #1306 from magento-jackalopes/pr

[Jackalopes] [Okapis] Combined PR

- MAGETWO-66480 [GITHUB] URL key for specified store already exists #6671
- MAGETWO-67296 String localization is not working when phrase contains quote (')
- MAGETWO-69657 Credit Card Information disappear after user enters promotion code
- MAGETWO-63249 [Elasticsearch] Composite products not searchable

Author: buskamuza

app/code/Magento/AdminNotification/i18n/en_US.csv

@@ -1,13 +1,13 @@
 "Read Details","Read Details"
 "Mark as Read","Mark as Read"
 "Are you sure?","Are you sure?"
-"Remove","Remove"
+Remove,Remove
 "Messages Inbox","Messages Inbox"
 "You have %1 new system messages","You have %1 new system messages"
 "You have %1 new system message","You have %1 new system message"
 "Incoming Message","Incoming Message"
-"close","close"
-"Notifications","Notifications"
+close,close
+Notifications,Notifications
 "The message has been marked as Read.","The message has been marked as Read."
 "We couldn't mark the notification as Read because of an error.","We couldn't mark the notification as Read because of an error."
 "Please select messages.","Please select messages."
@@ -20,10 +20,10 @@
 "6 Hours","6 Hours"
 "12 Hours","12 Hours"
 "24 Hours","24 Hours"
-"critical","critical"
-"major","major"
-"minor","minor"
-"notice","notice"
+critical,critical
+major,major
+minor,minor
+notice,notice
 "Wrong message type","Wrong message type"
 "Wrong notification ID specified.","Wrong notification ID specified."
 "{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>.","{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. We highly recommend changing this value in your Magento <a href=""%1"">configuration</a>."
@@ -32,20 +32,19 @@
 "We were unable to synchronize one or more media files. Please refer to the log file for details.","We were unable to synchronize one or more media files. Please refer to the log file for details."
 "Synchronization of media storages has been completed.","Synchronization of media storages has been completed."
 "Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider.","Your web server is set up incorrectly and allows unauthorized access to sensitive files. Please contact your hosting provider."
-"Close popup","Close popup"
-"Close","Close"
 "System Messages:","System Messages:"
 "Critical System Messages","Critical System Messages"
 "Major System Messages","Major System Messages"
 "System messages","System messages"
+Close,Close
 "See All (","See All ("
 " unread)"," unread)"
 "Show Toolbar","Show Toolbar"
 "Show List","Show List"
 "Use HTTPS to Get Feed","Use HTTPS to Get Feed"
 "Update Frequency","Update Frequency"
 "Last Update","Last Update"
-"Severity","Severity"
+Severity,Severity
 "Date Added","Date Added"
-"Message","Message"
-"Actions","Actions"
+Message,Message
+Actions,Actions

app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv

@@ -1,4 +1,4 @@
 "Please correct the data sent.","Please correct the data sent."
-"Entity type model \'%1\' is not found","Entity type model \'%1\' is not found"
+"Entity type model '%1' is not found","Entity type model '%1' is not found"
 "Entity type model must be an instance of \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType","Entity type model must be an instance of \Magento\CatalogImportExport\Model\Export\Product\Type\AbstractType"
 "There are no product types available for export","There are no product types available for export"

app/code/Magento/Analytics/i18n/en_US.csv

@@ -0,0 +1,84 @@
+"Subscription status","Subscription status"
+"Sorry, there has been an error processing your request. Please try again later.","Sorry, there has been an error processing your request. Please try again later."
+"Sorry, there was an error processing your registration request to Magento Analytics. Please try again later.","Sorry, there was an error processing your registration request to Magento Analytics. Please try again later."
+"Error occurred during postponement notification","Error occurred during postponement notification"
+"Time value has an unsupported format","Time value has an unsupported format"
+"Cron settings can't be saved","Cron settings can't be saved"
+"There was an error save new configuration value.","There was an error save new configuration value."
+"Please select a vertical.","Please select a vertical."
+"--Please Select--","--Please Select--"
+"Command was not found.","Command was not found."
+"Input data must be string or convertible into string.","Input data must be string or convertible into string."
+"Input data must be non-empty string.","Input data must be non-empty string."
+"Not valid cipher method.","Not valid cipher method."
+"Encryption key can't be empty.","Encryption key can't be empty."
+"Source ""%1"" is not exist","Source ""%1"" is not exist"
+"These arguments can't be empty ""%1""","These arguments can't be empty ""%1"""
+"Cannot find predefined integration user!","Cannot find predefined integration user!"
+"File is not ready yet.","File is not ready yet."
+"Failed to synchronize data to the Magento Business Intelligence service. ","Failed to synchronize data to the Magento Business Intelligence service. "
+"<a href=""%1"">Retry Synchronization</a>","<a href=""%1"">Retry Synchronization</a>"
+TestMessage,TestMessage
+"Error message","Error message"
+"Apps and Games","Apps and Games"
+"Athletic/Sporting Goods","Athletic/Sporting Goods"
+"Art and Design","Art and Design"
+"Advanced Reporting","Advanced Reporting"
+"Gain new insights and take command of your business' performance, using our dynamic product, order, and customer reports tailored to your customer data.","Gain new insights and take command of your business' performance, using our dynamic product, order, and customer reports tailored to your customer data."
+"View details","View details"
+"Go to Advanced Reporting","Go to Advanced Reporting"
+"An error occurred while subscription process.","An error occurred while subscription process."
+Analytics,Analytics
+API,API
+Configuration,Configuration
+"Business Intelligence","Business Intelligence"
+"BI Essentials","BI Essentials"
+"This service provides a suite of dynamic reports based on your product, order and
+                customer data. All reports are accessed securely on a personalized dashboard dedicated to your reports -
+                separate from your Admin Panel.</br> For more information, <a href=""#"">view details</a> or see our
+                <a href=""#"">terms and conditions</a>.","This service provides a suite of dynamic reports based on your product, order and
+                customer data. All reports are accessed securely on a personalized dashboard dedicated to your reports -
+                separate from your Admin Panel.</br> For more information, <a href=""#"">view details</a> or see our
+                <a href=""#"">terms and conditions</a>."
+"Advanced Reporting Service","Advanced Reporting Service"
+Industry,Industry
+"Time of day to send data","Time of day to send data"
+"<strong>Get more insights from Magento Business Intelligence</strong>","<strong>Get more insights from Magento Business Intelligence</strong>"
+"Magento Business Intelligence provides you with a simple and clear path to
+                    becoming more data driven.</br> Learn more about <a target=""_blank""
+                    href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier.","Magento Business Intelligence provides you with a simple and clear path to
+                    becoming more data driven.</br> Learn more about <a target=""_blank""
+                    href=""https://dashboard.rjmetrics.com/v2/magento/signup/"">BI Essentials</a> tier."
+"Analytics Subscription","Analytics Subscription"
+"powered by Magento Business Intelligence","powered by Magento Business Intelligence"
+"<p>When you turn on Advanced
+                        Reporting, you'll have access to a suite of dynamic reports tailored to your business. Example
+                        of the new data and trend reports, listed by category, include:</p><ul class=""list"">
+                        <li><strong>Order:</strong> Number of orders, total revenue, and AOV</li><li><strong>Customer:
+                        </strong> New registered accounts, unique customers, number of orders, AOV, revenue by email
+                        </li><li><strong>Product:</strong> Quantity sold, bestsellers by volume/revenue</li></ul><p>A
+                        personalized dashboard includes all reports - separate from your Admin Panel, yet still at your
+                        fingertips.</p><p>We're excited to offer these valuable tools that can help your business become
+                        more data-driven. For more information, <a href=""#"" target=""_blank"">view details</a> or see our
+                        <a href=""#"" target=""_blank"">terms and conditions</a>.</p>
+                        ","<p>When you turn on Advanced
+                        Reporting, you'll have access to a suite of dynamic reports tailored to your business. Example
+                        of the new data and trend reports, listed by category, include:</p><ul class=""list"">
+                        <li><strong>Order:</strong> Number of orders, total revenue, and AOV</li><li><strong>Customer:
+                        </strong> New registered accounts, unique customers, number of orders, AOV, revenue by email
+                        </li><li><strong>Product:</strong> Quantity sold, bestsellers by volume/revenue</li></ul><p>A
+                        personalized dashboard includes all reports - separate from your Admin Panel, yet still at your
+                        fingertips.</p><p>We're excited to offer these valuable tools that can help your business become
+                        more data-driven. For more information, <a href=""#"" target=""_blank"">view details</a> or see our
+                        <a href=""#"" target=""_blank"">terms and conditions</a>.</p>
+                        "
+"Are you sure you want to opt out?","Are you sure you want to opt out?"
+Cancel,Cancel
+"Opt out","Opt out"
+"<p>Advanced Reporting in included,
+                    free of charge, in your Magento software. When you opt out, we collect no product, order, and
+                    customer data to generate our dynamic reports.</p><p>To opt in later: You can always turn on Advanced
+                    Reporting in you Admin Panel.</p>","<p>Advanced Reporting in included,
+                    free of charge, in your Magento software. When you opt out, we collect no product, order, and
+                    customer data to generate our dynamic reports.</p><p>To opt in later: You can always turn on Advanced
+                    Reporting in you Admin Panel.</p>"

app/code/Magento/Authorization/i18n/en_US.csv

@@ -1,2 +1,2 @@
-"We can\'t find the role for the user you wanted.","We can\'t find the role for the user you wanted."
+"We can't find the role for the user you wanted.","We can't find the role for the user you wanted."
 "Something went wrong while compiling a list of allowed resources. You can find out more in the exceptions log.","Something went wrong while compiling a list of allowed resources. You can find out more in the exceptions log."

app/code/Magento/Authorizenet/i18n/en_US.csv

@@ -1,7 +1,7 @@
 "You created the order.","You created the order."
 "Order saving error: %1","Order saving error: %1"
 "Please choose a payment method.","Please choose a payment method."
-"We can\'t process your order right now. Please try again later.","We can\'t process your order right now. Please try again later."
+"We can't process your order right now. Please try again later.","We can't process your order right now. Please try again later."
 "An error occurred on the server. Please try to place the order again.","An error occurred on the server. Please try to place the order again."
 "Credit Card: xxxx-%1","Credit Card: xxxx-%1"
 "amount %1","amount %1"
@@ -22,16 +22,18 @@ void,void
 "Invalid amount for refund.","Invalid amount for refund."
 "Payment refunding error.","Payment refunding error."
 "The transaction was declined because the response hash validation failed.","The transaction was declined because the response hash validation failed."
-"This payment didn\'t work out because we can\'t find this order.","This payment didn\'t work out because we can\'t find this order."
+"This payment didn't work out because we can't find this order.","This payment didn't work out because we can't find this order."
 "There was a payment authorization error.","There was a payment authorization error."
 "Please enter a transaction ID to authorize this payment.","Please enter a transaction ID to authorize this payment."
-"Something went wrong: the paid amount doesn\'t match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn\'t match the order amount. Please correct this and try again."
+"Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again.","Something went wrong: the paid amount doesn't match the order amount. Please correct this and try again."
 "Transaction %1 has been approved. Amount %2. Transaction status is ""%3""","Transaction %1 has been approved. Amount %2. Transaction status is ""%3"""
 "Transaction %1 has been voided/declined. Transaction status is ""%2"". Amount %3.","Transaction %1 has been voided/declined. Transaction status is ""%2"". Amount %3."
 "Authorize Only","Authorize Only"
 "Authorize and Capture","Authorize and Capture"
 "Unable to get transaction details. Try again later.","Unable to get transaction details. Try again later."
+"Electronic payments save the trees.","Electronic payments save the trees."
 "Credit Card Type","Credit Card Type"
+"Please Select","Please Select"
 "Credit Card Number","Credit Card Number"
 "Expiration Date","Expiration Date"
 "Card Verification Number","Card Verification Number"
@@ -42,6 +44,7 @@ void,void
 "CAVV Response","CAVV Response"
 "Fraud Filters","Fraud Filters"
 "Place Order","Place Order"
+"Sorry, but something went wrong. Please contact the seller.","Sorry, but something went wrong. Please contact the seller."
 "Authorize.net Direct Post","Authorize.net Direct Post"
 Enabled,Enabled
 "Payment Action","Payment Action"
@@ -64,4 +67,3 @@ Debug,Debug
 "Minimum Order Total","Minimum Order Total"
 "Maximum Order Total","Maximum Order Total"
 "Sort Order","Sort Order"
-"Sorry, but something went wrong. Please contact the seller.","Sorry, but something went wrong. Please contact the seller."

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanMediaTest.php

@@ -26,11 +26,26 @@ public function testExecute()
             ['setIsUrlNotice'],
             $helper->getConstructArguments(\Magento\Backend\Model\Session::class)
         );
+
+        $exceptionMessageFactory = $this->getMockBuilder(
+            \Magento\Framework\Message\ExceptionMessageLookupFactory::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(
+                ['getMessageGenerator']
+            )
+            ->getMock();
+
+        $messageManagerParams = $helper->getConstructArguments(\Magento\Framework\Message\Manager::class);
+
+        $messageManagerParams['exceptionMessageFactory'] = $exceptionMessageFactory;
+
         $messageManager = $this->getMock(
             \Magento\Framework\Message\Manager::class,
             ['addSuccess'],
-            $helper->getConstructArguments(\Magento\Framework\Message\Manager::class)
+            $messageManagerParams
         );
+
         $context = $this->getMock(
             \Magento\Backend\App\Action\Context::class,
             ['getRequest', 'getResponse', 'getMessageManager', 'getSession', 'getResultFactory'],