From 5271c44a7905fc416ed21fe7eaecfa59b7de98c0 Mon Sep 17 00:00:00 2001 From: Iwona Just Date: Fri, 23 Aug 2024 11:44:21 +0100 Subject: [PATCH 1/3] update locality type label to add town_city --- src/services/Addresses.php | 3 ++- src/translations/en/app.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/Addresses.php b/src/services/Addresses.php index bb05579878f..232f51e97e0 100644 --- a/src/services/Addresses.php +++ b/src/services/Addresses.php @@ -274,9 +274,10 @@ public function formatAddress(Address $address, array $options = [], FormatterIn public function getLocalityTypeLabel(?string $type): string { return match ($type) { - LocalityType::SUBURB => Craft::t('app', 'Suburb'), LocalityType::DISTRICT => Craft::t('app', 'District'), LocalityType::POST_TOWN => Craft::t('app', 'Post Town'), + LocalityType::SUBURB => Craft::t('app', 'Suburb'), + LocalityType::TOWN_CITY => Craft::t('app', 'Town/City'), default => Craft::t('app', 'City'), }; } diff --git a/src/translations/en/app.php b/src/translations/en/app.php index 2340d5f9f08..42ac4622205 100644 --- a/src/translations/en/app.php +++ b/src/translations/en/app.php @@ -1710,6 +1710,7 @@ 'Top-Right' => 'Top-Right', 'Total Price' => 'Total Price', 'Total releases' => 'Total releases', + 'Town/City' => 'Town/City', 'Townland' => 'Townland', 'Transcript' => 'Transcript', 'Transfer it to:' => 'Transfer it to:', From ccd46122fb0c9eb1921ce914b54e3488c0fc93ac Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Mon, 26 Aug 2024 10:37:20 -0400 Subject: [PATCH 2/3] "City/Town" --- src/services/Addresses.php | 2 +- src/translations/en/app.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/Addresses.php b/src/services/Addresses.php index 232f51e97e0..6f274d9823e 100644 --- a/src/services/Addresses.php +++ b/src/services/Addresses.php @@ -277,7 +277,7 @@ public function getLocalityTypeLabel(?string $type): string LocalityType::DISTRICT => Craft::t('app', 'District'), LocalityType::POST_TOWN => Craft::t('app', 'Post Town'), LocalityType::SUBURB => Craft::t('app', 'Suburb'), - LocalityType::TOWN_CITY => Craft::t('app', 'Town/City'), + LocalityType::TOWN_CITY => Craft::t('app', 'City/Town'), default => Craft::t('app', 'City'), }; } diff --git a/src/translations/en/app.php b/src/translations/en/app.php index aaefffb860c..932e1c5b697 100644 --- a/src/translations/en/app.php +++ b/src/translations/en/app.php @@ -287,6 +287,7 @@ 'Choose which users must use two-step verification when accessing the control panel.' => 'Choose which users must use two-step verification when accessing the control panel.', 'Choose' => 'Choose', 'City' => 'City', + 'City/Town' => 'City/Town', 'Clear Caches' => 'Clear Caches', 'Clear all' => 'Clear all', 'Clear caches' => 'Clear caches', @@ -1710,7 +1711,6 @@ 'Top-Right' => 'Top-Right', 'Total Price' => 'Total Price', 'Total releases' => 'Total releases', - 'Town/City' => 'Town/City', 'Townland' => 'Townland', 'Transcript' => 'Transcript', 'Transfer it to:' => 'Transfer it to:', From 602db33f272c851becdd3283bc95a19d9a7c119f Mon Sep 17 00:00:00 2001 From: brandonkelly Date: Mon, 26 Aug 2024 10:40:02 -0400 Subject: [PATCH 3/3] Release note [ci skip] --- CHANGELOG-WIP.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md index 23c7af4838b..dafae27a1f7 100644 --- a/CHANGELOG-WIP.md +++ b/CHANGELOG-WIP.md @@ -32,4 +32,5 @@ ### System - MySQL mutex locks and PHP session names are now namespaced using the application ID combined with the environment name. ([#15313](https://github.com/craftcms/cms/issues/15313)) +- Added support for “City/Town” address locality labels. ([#15585](https://github.com/craftcms/cms/pull/15585)) - Fixed styling issues. ([#15537](https://github.com/craftcms/cms/pull/15537))