ENGCOM-7244: Customer attribute frontend labels not using the store label values on the frontend #27064

Author: slavvka

app/code/Magento/Customer/Block/DataProviders/AddressAttributeData.php

@@ -52,7 +52,7 @@ public function getFrontendLabel(string $attributeCode): string
     {
         try {
             $attribute =  $this->addressMetadata->getAttributeMetadata($attributeCode);
-            $frontendLabel = $attribute->getFrontendLabel();
+            $frontendLabel = $attribute->getStoreLabel() ?: $attribute->getFrontendLabel();
         } catch (NoSuchEntityException $e) {
             $frontendLabel = '';
         }

dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php

@@ -138,6 +138,22 @@ public function testFaxEnabled(): void
         $this->assertStringContainsString('title="Fax"', $block->toHtml());
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/attribute_city_store_label_address.php
+     */
+    public function testCityWithStoreLabel(): void
+    {
+        /** @var \Magento\Customer\Block\Form\Register $block */
+        $block = Bootstrap::getObjectManager()->create(
+            Register::class
+        )->setTemplate('Magento_Customer::form/register.phtml')
+            ->setShowAddressFields(true);
+        $this->setAttributeDataProvider($block);
+
+        $this->assertStringNotContainsString('title="City"', $block->toHtml());
+        $this->assertStringContainsString('title="Suburb"', $block->toHtml());
+    }
+
     /**
      * @inheritdoc
      */

dev/tests/integration/testsuite/Magento/Customer/_files/attribute_city_store_label_address.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+//@codingStandardsIgnoreFile
+/** @var \Magento\Customer\Model\Attribute $model */
+$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Attribute::class);
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\StoreManager::class);
+$model->loadByCode('customer_address', 'city');
+$storeLabels = $model->getStoreLabels();
+$stores = $storeManager->getStores();
+/** @var \Magento\Store\Api\Data\WebsiteInterface $website */
+foreach ($stores as $store) {
+    $storeLabels[$store->getId()] = 'Suburb';
+}
+$model->setStoreLabels($storeLabels);
+$model->save();