Merge remote-tracking branch 'api/MAGETWO-37843-responsive-email-templates-in-blank-theme' into prs-ee

Author: vpelipenko

.travis.yml

@@ -28,7 +28,7 @@ before_install:
            $HOME/.cache/bin/composer self-update; echo '';
          else
            mkdir -p $HOME/.cache/bin;
-           curl --connect-timeout 30 -sS https://getcomposer.org/installer \
+           curl --connect-timeout 30 -sS https://getcomposer.org/installer
            | php -- --install-dir $HOME/.cache/bin/ --filename composer;
          fi
        fi'

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

@@ -352,8 +352,9 @@
             <resource>Magento_Config::config_admin</resource>
             <group id="emails" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Admin User Emails</label>
-                <field id="forgot_email_template" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                <field id="forgot_email_template" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Forgot Password Email Template</label>
+                    <comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
                 </field>
                 <field id="forgot_email_identity" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">

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

@@ -36,7 +36,7 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
      * @param \Magento\Framework\Object $item
      * @return array|null
      */
-    public function getChilds($item)
+    public function getChildren($item)
     {
         $itemsArray = [];
 

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -125,7 +125,7 @@ public function getValueHtml($item)
      * @param \Magento\Framework\Object $item
      * @return array
      */
-    public function getChilds($item)
+    public function getChildren($item)
     {
         $itemsArray = [];
 

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -18,7 +18,7 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
      * @param \Magento\Framework\Object $item
      * @return array
      */
-    public function getChilds($item)
+    public function getChildren($item)
     {
         $itemsArray = [];
 

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php

@@ -67,7 +67,7 @@ public function draw()
         $pdf = $this->getPdf();
         $page = $this->getPage();
 
-        $items = $this->getChilds($item);
+        $items = $this->getChildren($item);
         $prevOptionId = '';
         $drawItems = [];
         $leftBound = 35;

app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php

@@ -69,7 +69,7 @@ public function draw()
         $page = $this->getPage();
 
         $this->_setFontRegular();
-        $items = $this->getChilds($item);
+        $items = $this->getChildren($item);
 
         $prevOptionId = '';
         $drawItems = [];

app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php

@@ -66,7 +66,7 @@ public function draw()
 
         $this->_setFontRegular();
 
-        $shipItems = $this->getChilds($item);
+        $shipItems = $this->getChildren($item);
         $items = array_merge([$item->getOrderItem()], $item->getOrderItem()->getChildrenItems());
 
         $prevOptionId = '';