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

 - Merge Pull Request #27064 from nntoan/magento2:fallback-to-storelabels-customer-attributes
 - Merged commits:
   1. fdec82c
   2. 9a7d68d
   3. 0bf66d9
   4. 9b6e058
   5. aa148c3
   6. 4c110b7
   7. 705b5be
   8. 5749b24
   9. d4ba184
   10. cec82da
   11. 2f0dae9
   12. 88da24a
   13. e99e6e1
   14. 5bc8bba
   15. 9f20b7f
   16. b1480fb
   17. 05fbd1f
   18. ef806a5
   19. dec273f
   20. 458ce8d
   21. 8848c6a
   22. 53498e1
   23. 893641c
   24. 48411f9
   25. b4f98d6
   26. 040c23d
   27. fc9b841
   28. 6a912c2
   29. e9b4cf0

Author: magento-engcom-team

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();