Merge #11057 commit 'refs/pull/11057/head' of https://github.com/mage…

…nto/magento2 into MAGETWO-80114-PR-11057 # Conflicts: # app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/swagger-ui.js # dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
magento · Sep 27, 2017 · de10ada · de10ada
2 parents e442de5 + 9fa5ddd
commit de10ada
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -186,7 +186,8 @@ public function getFieldHtml()
             'max_date' => '-1d',
             'change_month' => 'true',
             'change_year' => 'true',
-            'show_on' => 'both'
+            'show_on' => 'both',
+            'first_day' => $this->getFirstDay()
         ]);
         return $this->dateElement->getHtml();
     }
@@ -307,4 +308,17 @@ public function getMaxDateRange()
         }
         return null;
     }
+
+    /**
+     * Return first day of the week
+     *
+     * @return int
+     */
+    public function getFirstDay()
+    {
+        return (int)$this->_scopeConfig->getValue(
+            'general/locale/firstday',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
@@ -26,6 +26,7 @@ protected function _toHtml()
         $changeYear = $this->getChangeYear();
         $maxDate = $this->getMaxDate();
         $showOn = $this->getShowOn();
+        $firstDay = $this->getFirstDay();
 
         $html .= '<script type="text/javascript">
             require(["jquery", "mage/calendar"], function($){
@@ -59,6 +60,7 @@ protected function _toHtml()
             ($changeMonth === null ? '' : ', changeMonth: ' . $changeMonth) .
             ($changeYear === null ? '' : ', changeYear: ' . $changeYear) .
             ($showOn ? ', showOn: "' . $showOn . '"' : '') .
+            ($firstDay ? ', firstDay: ' . $firstDay : '') .
             '})
             });
             </script>';