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)) diff --git a/src/services/Addresses.php b/src/services/Addresses.php index bb05579878f..6f274d9823e 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', 'City/Town'), default => Craft::t('app', 'City'), }; } diff --git a/src/translations/en/app.php b/src/translations/en/app.php index 79a8099f3f0..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',