Merge remote-tracking branch 'origin/4.6'

ibexa · Sep 25, 2024 · c35ad19 · c35ad19
2 parents 8be653b + 0a7b7a0
commit c35ad19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezrichtext.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezrichtext.html.twig
@@ -6,6 +6,7 @@
     } %}
     <div class="hidden" data-udw-config-name="richtext_embed" data-udw-config="{{ ibexa_udw_config('richtext_embed', udw_context) }}"></div>
     <div class="hidden" data-udw-config-name="richtext_embed_image" data-udw-config="{{ ibexa_udw_config('richtext_embed_image', udw_context) }}"></div>
+    {%- block richtext_extra_config -%}{%- endblock -%}
     <div class="ibexa-data-source__richtext" id="{{ form.vars.id }}__editable"></div>
     <div class="ibexa-richtext-tools">
         <ul class="ibexa-elements-path"></ul>

diff --git a/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig b/src/bundle/Resources/views/themes/admin/ui/form_fields.html.twig
@@ -517,6 +517,7 @@
     {%- set title -%}
         {{ 'distraction_free_mode.disable_hint'|trans({ '%icon%': title_icon|raw })|desc('To exit distraction free mode, click the %icon% or press Esc.')|raw }}
     {%- endset -%}
+    {% set fieldtype_is_not_translatable = fieldtype_is_not_translatable|default(false) %}
 
     <div class="ibexa-field-edit__distraction-free-mode">
         <div class="ibexa-field-edit__distraction-free-mode-notice-container">