diff --git a/templates/content/_fields.html.twig b/templates/content/_fields.html.twig index 9e7fb42a0..b2b38eb2c 100644 --- a/templates/content/_fields.html.twig +++ b/templates/content/_fields.html.twig @@ -4,7 +4,14 @@ aria-labelledby="{{ group|slug }}-tab"> {% for key, fielddefinition in record.definition.fields|filter(fielddefinition => fielddefinition.group == group) %} {% if record.hasField(key) %} - {% set field = record.getField(key)|translated(currentlocale) %} + {% set field = record.getField(key) %} + {% if field.isTranslatable %} + {# If the field is translatable, we want the translated value in the current locale #} + {% set field = field|translated(currentlocale) %} + {% else %} + {# Otherwise, we want the value in the default locale, explicitly in case it is something else #} + {% set field = field|translated(field.defaultLocale) %} + {% endif %} {% else %} {% set field = field_factory(key, fielddefinition) %} {% endif %}