Merge remote-tracking branch 'mainline-ce/develop' into new-PAT

Author: sdwright

app/code/Magento/Ui/Component/Form/Element/DataType/Date.php

@@ -60,14 +60,15 @@ public function __construct(
     public function prepare()
     {
         $config = $this->getData('config');
+
         if (!isset($config['storeTimeZone'])) {
             $storeTimeZone = $this->localeDate->getConfigTimezone();
             $config['storeTimeZone'] = $storeTimeZone;
         }
         // Set date format pattern by current locale
         $localeDateFormat = $this->localeDate->getDateFormat();
         $config['options']['dateFormat'] = $localeDateFormat;
-        $config['outputDateFormat'] = $localeDateFormat;
+        $config['options']['storeLocale'] = $this->locale;
         $this->setData('config', $config);
         parent::prepare();
     }

app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php

@@ -70,9 +70,6 @@ public function testPrepareWithTimeOffset()
         $this->assertArrayHasKey('options', $config);
         $this->assertArrayHasKey('dateFormat', $config['options']);
         $this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
-
-        $this->assertArrayHasKey('outputDateFormat', $config);
-        $this->assertEquals($localeDateFormat, $config['outputDateFormat']);
     }
 
     public function testPrepareWithoutTimeOffset()
@@ -112,15 +109,14 @@ public function testPrepareWithoutTimeOffset()
         $this->assertArrayHasKey('dateFormat', $config['options']);
         $this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
 
-        $this->assertArrayHasKey('outputDateFormat', $config);
-        $this->assertEquals($localeDateFormat, $config['outputDateFormat']);
     }
 
     /**
      * This tests ensures that userTimeZone is properly saved in the configuration
      */
     public function testPrepare()
     {
+        $this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn('de-DE');
         $this->date = $this->objectManagerHelper->getObject(
             Date::class,
             [
@@ -133,5 +129,6 @@ public function testPrepare()
         $this->date->prepare();
         $configArray = $this->date->getData('config');
         $this->assertEquals('America/Chicago', $configArray['storeTimeZone']);
+        $this->assertEquals('de-DE', $configArray['options']['storeLocale']);
     }
 }

app/code/Magento/Ui/view/base/web/js/form/element/date.js

@@ -1,5 +1,5 @@
 /**
- * Copyright © 2015 Magento. All rights reserved.
+ * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 define([
@@ -53,6 +53,12 @@ define([
             pickerDefaultDateFormat: 'MM/dd/y', // ICU Date Format
             pickerDefaultTimeFormat: 'h:mm a', // ICU Time Format
 
+            /**
+             * Moment compatible format used for moment conversion
+             * of date from datePicker
+             */
+            momentFormat: 'MM/DD/YYYY',
+
             elementTmpl: 'ui/form/element/date',
 
             listens: {
@@ -142,7 +148,7 @@ define([
                     formattedValue = moment(shiftedValue).format('YYYY-MM-DD HH:mm');
                     value = moment.tz(formattedValue, this.storeTimeZone).tz('UTC').toISOString();
                 } else {
-                    value = moment(shiftedValue, this.pickerDateTimeFormat);
+                    value = moment(shiftedValue, this.momentFormat);
                     value = value.format(this.outputDateFormat);
                 }
             } else {
@@ -160,6 +166,8 @@ define([
          */
         prepareDateTimeFormats: function () {
             this.pickerDateTimeFormat = this.options.dateFormat;
+            this.momentFormat = this.options.dateFormat ?
+                this.convertToMomentFormat(this.options.dateFormat) : this.momentFormat;
 
             if (this.options.showsTime) {
                 this.pickerDateTimeFormat += ' ' + this.options.timeFormat;
@@ -175,6 +183,22 @@ define([
             this.outputDateFormat = utils.normalizeDate(this.outputDateFormat);
 
             this.validationParams.dateFormat = this.outputDateFormat;
+        },
+
+        /**
+         * Converts PHP IntlFormatter format to moment format.
+         *
+         * @param {String} format - PHP format
+         * @returns {String} - moment compatible formatting
+         */
+        convertToMomentFormat: function (format) {
+            var newFormat;
+
+            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
+            newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the date
+            newFormat = newFormat.replace(/mm|m/gi, 'MM'); //replace the month
+
+            return newFormat;
         }
     });
 });