Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '5.0' into 5.1
* 5.0:
  [MediaBundle] Remove unnecessary raw filter on translations
  • Loading branch information
acrobat committed Oct 21, 2019
2 parents 087eef4 + 8dcf56c commit bf060c8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Expand Up @@ -8,14 +8,14 @@
<i class="fa fa-times"></i>
</button>
<h3>
{{ 'media.folder.delete.modal.title'| trans({'%folder%': folder.name }) | raw }}
{{ 'media.folder.delete.modal.title'| trans({'%folder%': folder.name }) }}
</h3>
</div>

<!-- Body -->
<div class="modal-body">
<p>
{{ 'media.folder.delete.modal.text'| trans({'%folder%': folder.name }) | raw }}
{{ 'media.folder.delete.modal.text'| trans({'%folder%': folder.name }) }}
</p>
</div>

Expand Down
Expand Up @@ -17,7 +17,7 @@

<!-- Body -->
<div class="modal-body">
{{ 'media.folder.empty.modal.text'| trans({'%folder%': folder.name }) | raw }}
{{ 'media.folder.empty.modal.text'| trans({'%folder%': folder.name }) }}

{{ form_widget(emptyform) }}
</div>
Expand Down
Expand Up @@ -9,7 +9,7 @@
<header class="app__content__header">
{% set title = 'media.media.bulkupload.addto' %}
<h1 class="app__content__header__title">
{{ title | trans({'%folder%': folder.name|trans }) | capitalize | raw }}
{{ title | trans({'%folder%': folder.name|trans }) | capitalize }}
</h1>
</header>
{% endblock %}
Expand Down
Expand Up @@ -2,7 +2,7 @@
{% form_theme form '@KunstmaanAdmin/Form/fields.html.twig' %}

{% block title %}
{{ 'media.media.new' | trans({'%folder%': folder.name|trans }) | raw }}
{{ 'media.media.new' | trans({'%folder%': folder.name|trans }) }}
{% endblock %}

{% block header %}{% endblock %}
Expand All @@ -15,7 +15,7 @@
<div class="row">
<div class="col-sm-6 col-md-8">
<h1 class="app__content__header__title">
{{ 'media.media.addto'| trans({'%folder%': folder.name|trans }) | raw }}
{{ 'media.media.addto'| trans({'%folder%': folder.name|trans }) }}
</h1>
</div>
<div class="col-sm-6 col-md-4">
Expand Down

0 comments on commit bf060c8

Please sign in to comment.