🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - #15222: [Backport] Fixed datepicker problem when using non en-US locale. (by @rogyar)
 - #15221: [Backport] Translate action Label (by @rogyar)

Author: magento-engcom-team

app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml

@@ -21,7 +21,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
                     <th><?php /* @escapeNotVerified */ echo $column['label']; ?></th>
                 <?php endforeach;?>
-                <th class="col-actions" colspan="<?php /* @escapeNotVerified */ echo $_colspan; ?>">Action</th>
+                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
             </tr>
             </thead>
             <tfoot>

lib/web/mage/utils/misc.js

@@ -245,7 +245,7 @@ define([
         convertToMomentFormat: function (format) {
             var newFormat;
 
-            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
+            newFormat = format.replace(/yyyy|yy|y/, 'YYYY'); // replace the year
             newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the day
 
             return newFormat;