bug #5764 Fix passing TranslatableInterface Choices to ChoiceField (A…

…munak)

This PR was merged into the 4.x branch.

Discussion
----------

Fix passing TranslatableInterface Choices to ChoiceField

The code checking whether a choice should be passed "untouched" because it already is Translatable (from #5066) is always false because it checks against the wrong variable. This results in the actual TranslatableMessage being thrown away.

Here `$selectedValue` is always an array key, so a string; the intention was probably to check against `$selectedLabel`.

Commits
-------

5fae8a6 Fix passing TranslatableInterface Choices to ChoiceConfigurator

src/Field/Configurator/ChoiceConfigurator.php

@@ -111,8 +111,8 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
         $flippedChoices = $areChoicesTranslatable ? $choices : array_flip($this->flatten($choices));
         foreach ((array) $fieldValue as $selectedValue) {
             if (null !== $selectedLabel = $flippedChoices[$selectedValue] ?? null) {
-                if ($selectedValue instanceof TranslatableInterface) {
-                    $choiceMessage = $selectedValue;
+                if ($selectedLabel instanceof TranslatableInterface) {
+                    $choiceMessage = $selectedLabel;
                 } else {
                     $choiceMessage = t(
                         $selectedLabel,