MAGETWO-53811: Region Names are not Translated on Checkout Shipping Form

Author: aakimov

app/code/Magento/Directory/Model/ResourceModel/Region/Collection.php

@@ -49,6 +49,7 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     ) {
         $this->_localeResolver = $localeResolver;
+        $this->_resource = $resource;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
     }
 
@@ -186,15 +187,26 @@ public function addRegionCodeOrNameFilter($region)
      */
     public function toOptionArray()
     {
-        $options = $this->_toOptionArray(
-            'region_id',
-            'default_name',
-            ['title' => 'default_name', 'country_id' => 'country_id']
-        );
+        $options = [];
+        $propertyMap = [
+            'value' => 'region_id',
+            'title' => 'default_name',
+            'country_id' => 'country_id',
+        ];
+
+        foreach ($this as $item) {
+            $option = [];
+            foreach ($propertyMap as $code => $field) {
+                $option[$code] = $item->getData($field);
+            }
+            $option['label'] = $item->getName();
+            $options[] = $option;
+        }
+
         if (count($options) > 0) {
             array_unshift(
                 $options,
-                ['title ' => null, 'value' => null, 'label' => __('Please select a region, state or province.')]
+                ['title' => null, 'value' => null, 'label' => __('Please select a region, state or province.')]
             );
         }
         return $options;

app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Directory\Test\Unit\Model\ResourceModel\Region;
+
+use Magento\Directory\Model\ResourceModel\Region\Collection;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactory;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\DataObject;
+use Psr\Log\LoggerInterface;
+
+class CollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    protected function setUp()
+    {
+        $entityFactoryMock = $this->getMock(EntityFactory::class, [], [], '', false);
+        $loggerMock = $this->getMock(LoggerInterface::class);
+        $fetchStrategyMock = $this->getMock(FetchStrategyInterface::class);
+        $eventManagerMock = $this->getMock(ManagerInterface::class);
+        $localeResolverMock = $this->getMock(ResolverInterface::class);
+        $connectionMock = $this->getMock(Mysql::class, [], [], '', false);
+        $resourceMock = $this->getMockForAbstractClass(AbstractDb::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getConnection', 'getMainTable', 'getTable', '__wakeup']
+        );
+
+        $selectMock = $this->getMock(Select::class, [], [], '', false);
+        $connectionMock->expects($this->any())->method('select')->will($this->returnValue($selectMock));
+        $resourceMock->expects($this->any())->method('getConnection')->will($this->returnValue($connectionMock));
+        $resourceMock->expects($this->any())->method('getTable')->will($this->returnArgument(0));
+
+        $this->collection = new Collection(
+            $entityFactoryMock,
+            $loggerMock,
+            $fetchStrategyMock,
+            $eventManagerMock,
+            $localeResolverMock,
+            $connectionMock,
+            $resourceMock
+        );
+    }
+
+    public function testToOptionArray()
+    {
+        $items = [
+            [
+                'name' => 'Region Name 1',
+                'default_name' => 'Default Region Name 1',
+                'region_id' => 1,
+                'country_id' => 1,
+            ],
+            [
+                'name' => 'Region Name 2',
+                'default_name' => 'Default Region Name 2',
+                'region_id' => 2,
+                'country_id' => 1,
+            ],
+        ];
+        foreach ($items as $itemData) {
+            $this->collection->addItem(new DataObject($itemData));
+        }
+
+        $expectedResult = [
+            [
+                'label' => __('Please select a region, state or province.'),
+                'value' => null,
+                'title' => null,
+            ],
+            [
+                'value' => 1,
+                'title' => 'Default Region Name 1',
+                'country_id' => 1,
+                'label' => 'Region Name 1',
+            ],
+            [
+                'value' => 2,
+                'title' => 'Default Region Name 2',
+                'country_id' => 1,
+                'label' => 'Region Name 2',
+            ],
+        ];
+
+        $this->assertEquals($expectedResult, $this->collection->toOptionArray());
+    }
+}