Merge pull request #4419 from neos/bugfix/4418-fix-electronic-address…

…-type
neos · Jul 27, 2023 · cb19129 · cb19129
2 parents 8c96f47 + 05b09c3
commit cb19129
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php b/Neos.Neos/Classes/Controller/Module/Administration/UsersController.php
@@ -500,7 +500,7 @@ protected function assignElectronicAddressOptions(): void
         $electronicAddressUsageTypes = [];
         $translationHelper = new TranslationHelper();
         foreach ($electronicAddress->getAvailableUsageTypes() as $type) {
-            $electronicAddressUsageTypes[$type] = $translationHelper->translate('users.electronicAddress.usage.type.' . $type, $type, [], 'Modules', 'Neos.Neos');
+            $electronicAddressUsageTypes[$type] = $type;
         }
         array_unshift($electronicAddressUsageTypes, '');
         $this->view->assignMultiple([

diff --git a/Neos.Neos/Resources/Private/Partials/Module/Shared/EditUser.html b/Neos.Neos/Resources/Private/Partials/Module/Shared/EditUser.html
@@ -107,7 +107,7 @@
 						</td>
 						<td>
 							<div class="neos-select">
-								<f:form.select property="electronicAddresses.{index}.usage" options="{electronicAddressUsageTypes}" />
+								<f:form.select property="electronicAddresses.{index}.usage" options="{electronicAddressUsageTypes}" translate="{by: 'id', prefix: 'users.electronicAddress.usage.type.', package: 'Neos.Neos', source: 'Modules'}" />
 							</div>
 						</td>
 						<td class="neos-control-group{f:validation.ifHasErrors(for: 'user.electronicAddresses', then: ' neos-error')}">

diff --git a/Neos.Neos/Resources/Private/Partials/Module/Shared/NewElectronicAddress.html b/Neos.Neos/Resources/Private/Partials/Module/Shared/NewElectronicAddress.html
@@ -25,7 +25,7 @@
 						<f:if condition="{electronicAddressUsageType}">
 							<label class="neos-radio neos-inline">
 								<f:form.radio property="usage" value="{electronicAddressUsageType}" checked="{f:if(condition: '{iterator.index} === 1', then: 'checked')}" /><span></span>
-								{neos:backend.translate(id: 'users.electronicAddress.usage.type.{electronicAddressUsageType}', package: 'Neos.Neos', value: '{electronicAddressUsageType}')}
+								{neos:backend.translate(id: 'users.electronicAddress.usage.type.{electronicAddressUsageType}', package: 'Neos.Neos', source: 'Modules', value: '{electronicAddressUsageType}')}
 							</label>
 						</f:if>
 					</f:for>