Issue 29209 - Enforce order store locale in sales email address / order creation display

app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php

@@ -143,11 +143,12 @@ public function getFormatArray($addressAttributes = null)
      *
      * @param array $addressAttributes
      * @param Format|null $format
+     * @param string|null $locale
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function renderArray($addressAttributes, $format = null)
+    public function renderArray($addressAttributes, $format = null, $locale = null)
     {
         switch ($this->getType()->getCode()) {
             case 'html':
@@ -174,7 +175,7 @@ public function renderArray($addressAttributes, $format = null)
             if ($attributeCode == 'country_id' && isset($addressAttributes['country_id'])) {
                 $data['country'] = $this->_countryFactory->create()->loadByCode(
                     $addressAttributes['country_id']
-                )->getName();
+                )->getName($locale);
             } elseif ($attributeCode == 'region' && isset($addressAttributes['region'])) {
                 $data['region'] = (string)__($addressAttributes['region']);
             } elseif (isset($addressAttributes[$attributeCode])) {

app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php

@@ -53,7 +53,8 @@ public function getFormatArray($addressAttributes = null);
      *
      * @param array $addressAttributes
      * @param Format|null $format
+     * @param string|null $locale
      * @return string
      */
-    public function renderArray($addressAttributes, $format = null);
+    public function renderArray($addressAttributes, $format = null, $locale = null);
 }

app/code/Magento/Sales/Model/Order.php

@@ -6,6 +6,7 @@
 namespace Magento\Sales\Model;
 
 use Magento\Config\Model\Config\Source\Nooptreq;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Directory\Model\Currency;
 use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\Api\AttributeValueFactory;
@@ -2052,7 +2053,7 @@ public function getCreatedAtFormatted($format)
             new \DateTime($this->getCreatedAt()),
             $format,
             $format,
-            $this->localeResolver->getDefaultLocale(),
+            $this->getLocale(),
             $this->timezone->getConfigTimezone('store', $this->getStore())
         );
     }
@@ -4586,6 +4587,20 @@ public function setShippingMethod($shippingMethod)
         return $this->setData('shipping_method', $shippingMethod);
     }
 
+    /**
+     * Return the locale for the order's store
+     *
+     * @return string
+     */
+    private function getLocale(): string
+    {
+        return (string) $this->scopeConfig->getValue(
+            DirectoryHelper::XML_PATH_DEFAULT_LOCALE,
+            ScopeInterface::SCOPE_STORES,
+            $this->getStoreId()
+        );
+    }
+
     /**
      * Is visible customer middlename
      *

app/code/Magento/Sales/Model/Order/Address/Renderer.php

@@ -7,8 +7,11 @@
 namespace Magento\Sales\Model\Order\Address;
 
 use Magento\Customer\Model\Address\Config as AddressConfig;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Sales\Model\Order\Address;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class Renderer used for formatting an order address
@@ -27,18 +30,26 @@ class Renderer
      */
     protected $eventManager;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
     /**
      * Constructor
      *
      * @param AddressConfig $addressConfig
      * @param EventManager $eventManager
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         AddressConfig $addressConfig,
-        EventManager $eventManager
+        EventManager $eventManager,
+        ScopeConfigInterface $scopeConfig
     ) {
         $this->addressConfig = $addressConfig;
         $this->eventManager = $eventManager;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -56,6 +67,11 @@ public function format(Address $address, $type)
             return null;
         }
         $this->eventManager->dispatch('customer_address_format', ['type' => $formatType, 'address' => $address]);
-        return $formatType->getRenderer()->renderArray($address->getData());
+        $locale = $this->scopeConfig->getValue(
+            DirectoryHelper::XML_PATH_DEFAULT_LOCALE,
+            ScopeInterface::SCOPE_STORES,
+            $address->getOrder()->getStoreId()
+        );
+        return $formatType->getRenderer()->renderArray($address->getData(), null, $locale);
     }
 }