MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation

Author: slavvka

dev/tests/unit/testsuite/Magento/Setup/Model/ListsTest.php

@@ -6,8 +6,6 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\TestFramework\Helper\ObjectManager;
-
 class ListsTest extends \PHPUnit_Framework_TestCase
 {
     /**

lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php

@@ -25,6 +25,7 @@ class DataBundle
      */
     public function get($locale)
     {
+        $locale = $this->cleanLocale($locale);
         $class = get_class($this);
         if (!isset(static::$bundles[$class][$locale])) {
             $bundle = new \ResourceBundle($locale, $this->path);
@@ -35,4 +36,23 @@ public function get($locale)
         }
         return static::$bundles[$class][$locale];
     }
+
+    /**
+     * Clean locale leaving only language and script
+     *
+     * @param string $locale
+     * @return string
+     */
+    protected function cleanLocale($locale)
+    {
+        $localeParts = \Locale::parseLocale($locale);
+        $cleanLocaleParts = [];
+        if (isset($localeParts['language'])) {
+            $cleanLocaleParts['language'] = $localeParts['language'];
+        }
+        if (isset($localeParts['script'])) {
+            $cleanLocaleParts['script'] = $localeParts['script'];
+        }
+        return \Locale::composeLocale($cleanLocaleParts);
+    }
 }

lib/internal/Magento/Framework/Locale/Lists.php

@@ -126,10 +126,7 @@ public function getOptionWeekdays($preserveCodes = false, $ucFirstCode = false)
         $days = (new DataBundle())->get(
             $this->localeResolver->getLocale()
         )['calendar']['gregorian']['dayNames']['format']['wide'];
-        $englishDays = (new DataBundle())->get(
-            'en_US',
-            'ICUDATA'
-        )['calendar']['gregorian']['dayNames']['format']['abbreviated'];
+        $englishDays = (new DataBundle())->get('en_US')['calendar']['gregorian']['dayNames']['format']['abbreviated'];
         foreach ($days as $code => $name) {
             $code = $preserveCodes ? $englishDays[$code] : $code;
             $options[] = ['label' => $name, 'value' => $ucFirstCode ? ucfirst($code) : $code];