merge magento/2.2-develop into magento-qwerty/2.2.4-PR-20170111

Author: Magento CICD

app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml

@@ -23,7 +23,7 @@
                            value=""
                            title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                            class="input-text qty"
-                           data-validate="{'required-number':true,digits:true}"/>
+                           data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"/>
                 </div>
             </div>
             <?php endif; ?>

app/code/Magento/Customer/Model/FileUploader.php

@@ -110,7 +110,7 @@ public function upload()
         $result = $fileProcessor->saveTemporaryFile($this->scope . '[' . $this->getAttributeCode() . ']');
 
         // Update tmp_name param. Required for attribute validation!
-        $result['tmp_name'] = $result['path'] . '/' . ltrim($result['file'], '/');
+        $result['tmp_name'] = ltrim($result['file'], '/');
 
         $result['url'] = $fileProcessor->getViewUrl(
             FileProcessor::TMP_DIR . '/' . ltrim($result['name'], '/'),

app/code/Magento/Customer/Test/Unit/Model/FileUploaderTest.php

@@ -140,7 +140,7 @@ public function testUpload()
             'name' => $resultFileName,
             'file' => $resultFileName,
             'path' => $resultFilePath,
-            'tmp_name' => $resultFilePath . $resultFileName,
+            'tmp_name' => ltrim($resultFileName, '/'),
             'url' => $resultFileUrl,
         ];
 

app/code/Magento/Translation/etc/di.xml

@@ -67,6 +67,7 @@
                 <item name="translate_wrapping" xsi:type="string"><![CDATA[~translate\=("')([^\'].*?)\'\"~]]></item>
                 <item name="mage_translation_widget" xsi:type="string"><![CDATA[~(?:\$|jQuery)\.mage\.__\((?s)[^'"]*?(['"])(.+?)(?<!\\)\1(?s).*?\)~]]></item>
                 <item name="mage_translation_static" xsi:type="string"><![CDATA[~\$t\((?s)[^'"]*?(["'])(.+?)\1(?s).*?\)~]]></item>
+                <item name="translate_args" xsi:type="string"><![CDATA[~translate args\=("|'|"')([^\'].*?)('"|'|")~]]></item>
             </argument>
         </arguments>
     </type>