Skip to content

Commit ece664d

Browse files
committed
Use unified lang translation filter from Grav 1.6rc2
1 parent 4361921 commit ece664d

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

templates/forms/default/data.html.twig

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,9 @@
1111
<div>
1212
{% block field_label %}
1313
{% if field.markdown %}
14-
{% if grav.twig.twig.filters['tu'] is defined %}
15-
<strong>{{ field.label|tu|markdown(false) }}</strong>:
16-
{% else %}
17-
<strong>{{ field.label|t|markdown(false) }}</strong>:
18-
{% endif %}
14+
<strong>{{ field.label|t|markdown(false) }}</strong>:
1915
{% else %}
20-
{% if grav.twig.twig.filters['tu'] is defined %}
21-
<strong>{{ field.label|tu|e }}</strong>:
22-
{% else %}
23-
<strong>{{ field.label|t|e }}</strong>:
24-
{% endif %}
16+
<strong>{{ field.label|t|e }}</strong>:
2517
{% endif %}
2618
{% endblock %}
2719

templates/forms/fields/checkbox/checkbox.html.twig

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,9 @@
2626
/>
2727
<label style="display:inline;" class="inline" for="{{ id|e }}">
2828
{% if field.markdown %}
29-
{% if grav.twig.twig.filters['tu'] is defined %}
30-
{{ field.label|tu|markdown(false) }}
31-
{% else %}
32-
{{ field.label|t|markdown(false) }}
33-
{% endif %}
29+
{{ field.label|t|markdown(false) }}
3430
{% else %}
35-
{% if grav.twig.twig.filters['tu'] is defined %}
36-
{{ field.label|tu|e }}
37-
{% else %}
38-
{{ field.label|t|e }}
39-
{% endif %}
31+
{{ field.label|t|e }}
4032
{% endif %}
4133
{{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
4234
</label>
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
{% block label %}
22
{% if field.markdown %}
3-
{% if grav.twig.twig.filters['tu'] is defined %}
4-
{{ field.label|tu|markdown(false) }}
5-
{% else %}
6-
{{ field.label|t|markdown(false) }}
7-
{% endif %}
3+
{{ field.label|t|markdown(false) }}
84
{% else %}
9-
{% if grav.twig.twig.filters['tu'] is defined %}
10-
{{ field.label|tu|e }}
11-
{% else %}
12-
{{ field.label|t|e }}
13-
{% endif %}
5+
{{ field.label|t|e }}
146
{% endif %}
157
{% endblock %}

0 commit comments

Comments
 (0)