Merge pull request #994 from magento-engcom/develop-prs

[EngCom] Public Pull Requests

Author: Oleksii Korshenko

app/code/Magento/Customer/Block/Account/Dashboard.php

@@ -170,10 +170,10 @@ public function getManageNewsletterUrl()
     public function getSubscriptionText()
     {
         if ($this->getSubscriptionObject()->isSubscribed()) {
-            return __('You subscribe to our newsletter.');
+            return __('You are subscribed to our newsletter.');
         }
 
-        return __('You don\'t subscribe to our newsletter.');
+        return __('You aren\'t subscribed to our newsletter.');
     }
 
     /**

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

@@ -1,7 +1,7 @@
 "Sign Out","Sign Out"
 "Sign In","Sign In"
-"You subscribe to our newsletter.","You subscribe to our newsletter."
-"You don\'t subscribe to our newsletter.","You don\'t subscribe to our newsletter."
+"You are subscribed to our newsletter.","You are subscribed to our newsletter."
+"You aren't subscribed to our newsletter.","You aren't subscribed to our newsletter."
 "You have not set a default shipping address.","You have not set a default shipping address."
 "You have not set a default billing address.","You have not set a default billing address."
 "Address Book","Address Book"
@@ -308,7 +308,7 @@ Change,Change
 "Contact Information","Contact Information"
 "Change Password","Change Password"
 Newsletters,Newsletters
-"You subscribe to ""General Subscription"".","You subscribe to ""General Subscription""."
+"You are subscribed to ""General Subscription"".","You are subscribed to ""General Subscription""."
 or,or
 "Default Addresses","Default Addresses"
 "Change Billing Address","Change Billing Address"

app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml

@@ -38,9 +38,9 @@
                 <div class="box-content">
                     <p>
                         <?php if ($block->getIsSubscribed()): ?>
-                            <?php echo $block->escapeHtml(__('You subscribe to "General Subscription".')) ?>
+                            <?php echo $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
                         <?php else: ?>
-                            <?php echo $block->escapeHtml(__('You don\'t subscribe to our newsletter.')) ?>
+                            <?php echo $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
                         <?php endif; ?>
                     </p>
                     <?php /* Extensions placeholder */ ?>

app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php

@@ -39,7 +39,7 @@ class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMas
     /**
      * @var ShipmentCollectionFactory
      */
-    protected $shipmentCollectionFactotory;
+    protected $shipmentCollectionFactory;
 
     /**
      * @param Context $context
@@ -63,7 +63,7 @@ public function __construct(
         $this->dateTime = $dateTime;
         $this->pdfShipment = $shipment;
         $this->collectionFactory = $collectionFactory;
-        $this->shipmentCollectionFactotory = $shipmentCollectionFactory;
+        $this->shipmentCollectionFactory = $shipmentCollectionFactory;
         parent::__construct($context, $filter);
     }
 
@@ -75,7 +75,7 @@ public function __construct(
      */
     protected function massAction(AbstractCollection $collection)
     {
-        $shipmentsCollection = $this->shipmentCollectionFactotory
+        $shipmentsCollection = $this->shipmentCollectionFactory
             ->create()
             ->setOrderFilter(['in' => $collection->getAllIds()]);
         if (!$shipmentsCollection->getSize()) {