Magento Auto Sync Merge from: magento / magento2ce / develop

magento · Mar 25, 2017 · 8cf01c2 · 8cf01c2
2 parents daec138 + 46eaf40
commit 8cf01c2
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 

diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -140,7 +140,7 @@ public function lockProductsStock($productIds, $websiteId)
     public function correctItemsQty(array $items, $websiteId, $operator)
     {
         if (empty($items)) {
-            return $this;
+            return;
         }
 
         $connection = $this->getConnection();

diff --git a/app/code/Magento/Downloadable/i18n/en_US.csv b/app/code/Magento/Downloadable/i18n/en_US.csv
@@ -44,7 +44,7 @@ inline,inline
 Pending,Pending
 Invoiced,Invoiced
 "To enable the option set the weight to no","To enable the option set the weight to no"
-"Is this downloadable Product?","Is this downloadable Product?"
+"Is this a downloadable Product?","Is this a downloadable Product?"
 Links,Links
 Title,Title
 "Links can be purchased separately","Links can be purchased separately"

diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
@@ -211,7 +211,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
     <input type="checkbox" data-action="change-type-product-downloadable"  class="admin__control-checkbox"
            name="is_downloadable" id="is-downloaodable" <?= $block->isDownloadable() ? 'checked="checked"' : ''?> />
     <label class="admin__field-label" for="is-downloaodable">
-        <span><?= /* @noEscape */ __('Is this downloadable Product?'); ?></span>
+        <span><?= /* @noEscape */ __('Is this a downloadable Product?'); ?></span>
     </label>
 </div>
 <div class="entry-edit" id="product_info_tabs_downloadable_items">

diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
@@ -242,7 +242,7 @@ public function addException(\Exception $exception, $alternativeText, $group = n
         );
 
         $this->logger->critical($message);
-        $this->addMessage($this->messageFactory->create(MessageInterface::TYPE_ERROR, $alternativeText), $group);
+        $this->addError($alternativeText, $group);
         return $this;
     }
 

diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -43,7 +43,7 @@ abstract protected function _construct();
      *
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      */
-    abstract protected function getConnection();
+    abstract public function getConnection();
 
     /**
      * Start resource transaction

diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceStub.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceStub.php
@@ -31,7 +31,7 @@ protected function _construct()
      *
      * @return AdapterInterface
      */
-    protected function getConnection()
+    public function getConnection()
     {
         return $this->connectionAdapter;
     }