From 83ef4ff529000658b5aaebc7846a0493c702c0a9 Mon Sep 17 00:00:00 2001 From: irauschek Date: Sat, 12 Jan 2019 21:04:20 +0100 Subject: [PATCH 1/3] add markdown evaluation to labels --- templates/forms/default/data.html.twig | 14 +++++++++++++- .../forms/fields/checkbox/checkbox.html.twig | 12 ++++++++++-- .../fields/checkboxes/checkboxes.html.twig | 16 ++++++++++++++++ templates/forms/fields/date/date.html.twig | 16 ++++++++++++++++ .../forms/fields/display/display.html.twig | 16 ++++++++++++++++ templates/forms/fields/email/email.html.twig | 18 +++++++++++++++++- templates/forms/fields/file/file.html.twig | 16 ++++++++++++++++ templates/forms/fields/month/month.html.twig | 16 ++++++++++++++++ .../forms/fields/password/password.html.twig | 16 ++++++++++++++++ templates/forms/fields/radio/radio.html.twig | 16 ++++++++++++++++ templates/forms/fields/range/range.html.twig | 16 ++++++++++++++++ templates/forms/fields/select/select.html.twig | 16 ++++++++++++++++ .../select_optgroup/select_optgroup.html.twig | 16 ++++++++++++++++ templates/forms/fields/tel/tel.html.twig | 18 +++++++++++++++++- templates/forms/fields/text/text.html.twig | 16 ++++++++++++++++ .../forms/fields/textarea/textarea.html.twig | 16 ++++++++++++++++ templates/forms/fields/time/time.html.twig | 16 ++++++++++++++++ 17 files changed, 265 insertions(+), 5 deletions(-) diff --git a/templates/forms/default/data.html.twig b/templates/forms/default/data.html.twig index 0b394c75..5e19b7e4 100644 --- a/templates/forms/default/data.html.twig +++ b/templates/forms/default/data.html.twig @@ -10,7 +10,19 @@ {% block field %}
{% block field_label %} - {{ field.label|t|e }}: + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }}: + {% else %} + {{ field.label|t|markdown(false) }}: + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }}: + {% else %} + {{ field.label|t|e }}: + {% endif %} + {% endif %} {% endblock %} {% block field_value %} diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig index 64cad540..4c2653b8 100644 --- a/templates/forms/fields/checkbox/checkbox.html.twig +++ b/templates/forms/fields/checkbox/checkbox.html.twig @@ -26,9 +26,17 @@ /> diff --git a/templates/forms/fields/checkboxes/checkboxes.html.twig b/templates/forms/fields/checkboxes/checkboxes.html.twig index d9b6b020..4a83c0f6 100644 --- a/templates/forms/fields/checkboxes/checkboxes.html.twig +++ b/templates/forms/fields/checkboxes/checkboxes.html.twig @@ -12,6 +12,22 @@ data-grav-field-name="{{ (scope ~ field.name)|fieldName }}" {% endblock %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input %} {% for key, text in field.options %} diff --git a/templates/forms/fields/date/date.html.twig b/templates/forms/fields/date/date.html.twig index 4e42985c..bbcc26d2 100644 --- a/templates/forms/fields/date/date.html.twig +++ b/templates/forms/fields/date/date.html.twig @@ -1,5 +1,21 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input_attributes %} type="date" {% if field.validate.min %}min="{{ field.validate.min }}"{% endif %} diff --git a/templates/forms/fields/display/display.html.twig b/templates/forms/fields/display/display.html.twig index 37d7382e..a470440c 100644 --- a/templates/forms/fields/display/display.html.twig +++ b/templates/forms/fields/display/display.html.twig @@ -6,6 +6,22 @@ {% set content = field.content %} {% endif %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input %}
{% if field.markdown %} diff --git a/templates/forms/fields/email/email.html.twig b/templates/forms/fields/email/email.html.twig index aa33dcf8..0c8df0ca 100644 --- a/templates/forms/fields/email/email.html.twig +++ b/templates/forms/fields/email/email.html.twig @@ -1,7 +1,23 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input_attributes %} type="email" {% if field.multiple in ['on', 'true', 1] %}multiple="multiple"{% endif %} {{ parent() }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/forms/fields/file/file.html.twig b/templates/forms/fields/file/file.html.twig index 8476eed1..be078cf2 100644 --- a/templates/forms/fields/file/file.html.twig +++ b/templates/forms/fields/file/file.html.twig @@ -58,6 +58,22 @@ {% do config.set('forms.dropzone.enabled', true) %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input %} {% set page_can_upload = exists or (type == 'page' and not exists and not (field.destination starts with '@self' or field.destination starts with 'self@')) %} {% set max_filesize = (field.filesize > form_max_filesize or field.filesize == 0) ? form_max_filesize : field.filesize %} diff --git a/templates/forms/fields/month/month.html.twig b/templates/forms/fields/month/month.html.twig index 36c0fc23..81191e18 100644 --- a/templates/forms/fields/month/month.html.twig +++ b/templates/forms/fields/month/month.html.twig @@ -1,5 +1,21 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input_attributes %} type="month" {{ parent() }} diff --git a/templates/forms/fields/password/password.html.twig b/templates/forms/fields/password/password.html.twig index 937eb2a6..f46b5832 100644 --- a/templates/forms/fields/password/password.html.twig +++ b/templates/forms/fields/password/password.html.twig @@ -1,5 +1,21 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input_attributes %} type="password" {{ parent() }} diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig index 23b0df47..a1933309 100644 --- a/templates/forms/fields/radio/radio.html.twig +++ b/templates/forms/fields/radio/radio.html.twig @@ -3,6 +3,22 @@ {% set originalValue = value %} {% set value = (value is null ? field.default : value) %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input %} {% for key, text in field.options %} {% set id = field.id|default(field.name) ~ '-' ~ key %} diff --git a/templates/forms/fields/range/range.html.twig b/templates/forms/fields/range/range.html.twig index 3b04284d..0d4c90ab 100644 --- a/templates/forms/fields/range/range.html.twig +++ b/templates/forms/fields/range/range.html.twig @@ -1,5 +1,21 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input_attributes %} type="range" {% if field.validate.min %}min="{{ field.validate.min }}"{% endif %} diff --git a/templates/forms/fields/select/select.html.twig b/templates/forms/fields/select/select.html.twig index b2b55f6d..d47b210d 100644 --- a/templates/forms/fields/select/select.html.twig +++ b/templates/forms/fields/select/select.html.twig @@ -5,6 +5,22 @@ {{ parent() }} {% endblock %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input %}
diff --git a/templates/forms/fields/textarea/textarea.html.twig b/templates/forms/fields/textarea/textarea.html.twig index 6ff616a0..dd467b07 100644 --- a/templates/forms/fields/textarea/textarea.html.twig +++ b/templates/forms/fields/textarea/textarea.html.twig @@ -1,5 +1,21 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input %}
{% block prepend %}{% endblock prepend %} diff --git a/templates/forms/fields/time/time.html.twig b/templates/forms/fields/time/time.html.twig index b6bb10ec..7c859be0 100644 --- a/templates/forms/fields/time/time.html.twig +++ b/templates/forms/fields/time/time.html.twig @@ -1,5 +1,21 @@ {% extends "forms/field.html.twig" %} +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} + {% block input_attributes %} type="time" {{ parent() }} From 436192162e15152b8d8f3886bad10ac09cd57729 Mon Sep 17 00:00:00 2001 From: irauschek Date: Fri, 30 Aug 2019 01:22:21 +0200 Subject: [PATCH 2/3] refactored markdown evaluation at labels --- .../forms/fields/checkboxes/checkboxes.html.twig | 16 +--------------- templates/forms/fields/date/date.html.twig | 16 +--------------- templates/forms/fields/display/display.html.twig | 16 +--------------- templates/forms/fields/email/email.html.twig | 16 +--------------- templates/forms/fields/file/file.html.twig | 16 +--------------- templates/forms/fields/label/label.html.twig | 15 +++++++++++++++ templates/forms/fields/month/month.html.twig | 16 +--------------- .../forms/fields/password/password.html.twig | 16 +--------------- templates/forms/fields/radio/radio.html.twig | 16 +--------------- templates/forms/fields/range/range.html.twig | 16 +--------------- templates/forms/fields/select/select.html.twig | 16 +--------------- .../select_optgroup/select_optgroup.html.twig | 16 +--------------- templates/forms/fields/tel/tel.html.twig | 16 +--------------- templates/forms/fields/text/text.html.twig | 16 +--------------- .../forms/fields/textarea/textarea.html.twig | 16 +--------------- templates/forms/fields/time/time.html.twig | 16 +--------------- 16 files changed, 30 insertions(+), 225 deletions(-) create mode 100644 templates/forms/fields/label/label.html.twig diff --git a/templates/forms/fields/checkboxes/checkboxes.html.twig b/templates/forms/fields/checkboxes/checkboxes.html.twig index 4a83c0f6..6c38130b 100644 --- a/templates/forms/fields/checkboxes/checkboxes.html.twig +++ b/templates/forms/fields/checkboxes/checkboxes.html.twig @@ -12,21 +12,7 @@ data-grav-field-name="{{ (scope ~ field.name)|fieldName }}" {% endblock %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %} {% for key, text in field.options %} diff --git a/templates/forms/fields/date/date.html.twig b/templates/forms/fields/date/date.html.twig index bbcc26d2..b875b4d2 100644 --- a/templates/forms/fields/date/date.html.twig +++ b/templates/forms/fields/date/date.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="date" diff --git a/templates/forms/fields/display/display.html.twig b/templates/forms/fields/display/display.html.twig index a470440c..62566f5d 100644 --- a/templates/forms/fields/display/display.html.twig +++ b/templates/forms/fields/display/display.html.twig @@ -6,21 +6,7 @@ {% set content = field.content %} {% endif %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %}
diff --git a/templates/forms/fields/email/email.html.twig b/templates/forms/fields/email/email.html.twig index 0c8df0ca..362243bf 100644 --- a/templates/forms/fields/email/email.html.twig +++ b/templates/forms/fields/email/email.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="email" diff --git a/templates/forms/fields/file/file.html.twig b/templates/forms/fields/file/file.html.twig index be078cf2..bd5b7c93 100644 --- a/templates/forms/fields/file/file.html.twig +++ b/templates/forms/fields/file/file.html.twig @@ -58,21 +58,7 @@ {% do config.set('forms.dropzone.enabled', true) %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %} {% set page_can_upload = exists or (type == 'page' and not exists and not (field.destination starts with '@self' or field.destination starts with 'self@')) %} diff --git a/templates/forms/fields/label/label.html.twig b/templates/forms/fields/label/label.html.twig new file mode 100644 index 00000000..1ba893e6 --- /dev/null +++ b/templates/forms/fields/label/label.html.twig @@ -0,0 +1,15 @@ +{% block label %} + {% if field.markdown %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|markdown(false) }} + {% else %} + {{ field.label|t|markdown(false) }} + {% endif %} + {% else %} + {% if grav.twig.twig.filters['tu'] is defined %} + {{ field.label|tu|e }} + {% else %} + {{ field.label|t|e }} + {% endif %} + {% endif %} +{% endblock %} diff --git a/templates/forms/fields/month/month.html.twig b/templates/forms/fields/month/month.html.twig index 81191e18..ae253f18 100644 --- a/templates/forms/fields/month/month.html.twig +++ b/templates/forms/fields/month/month.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="month" diff --git a/templates/forms/fields/password/password.html.twig b/templates/forms/fields/password/password.html.twig index f46b5832..82a24f2d 100644 --- a/templates/forms/fields/password/password.html.twig +++ b/templates/forms/fields/password/password.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="password" diff --git a/templates/forms/fields/radio/radio.html.twig b/templates/forms/fields/radio/radio.html.twig index a1933309..c898073a 100644 --- a/templates/forms/fields/radio/radio.html.twig +++ b/templates/forms/fields/radio/radio.html.twig @@ -3,21 +3,7 @@ {% set originalValue = value %} {% set value = (value is null ? field.default : value) %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %} {% for key, text in field.options %} diff --git a/templates/forms/fields/range/range.html.twig b/templates/forms/fields/range/range.html.twig index 0d4c90ab..d4e75ebe 100644 --- a/templates/forms/fields/range/range.html.twig +++ b/templates/forms/fields/range/range.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="range" diff --git a/templates/forms/fields/select/select.html.twig b/templates/forms/fields/select/select.html.twig index d47b210d..f40358b2 100644 --- a/templates/forms/fields/select/select.html.twig +++ b/templates/forms/fields/select/select.html.twig @@ -5,21 +5,7 @@ {{ parent() }} {% endblock %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %}
diff --git a/templates/forms/fields/select_optgroup/select_optgroup.html.twig b/templates/forms/fields/select_optgroup/select_optgroup.html.twig index 38bcd276..81dd0209 100644 --- a/templates/forms/fields/select_optgroup/select_optgroup.html.twig +++ b/templates/forms/fields/select_optgroup/select_optgroup.html.twig @@ -5,21 +5,7 @@ {{ parent() }} {% endblock %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %}
diff --git a/templates/forms/fields/tel/tel.html.twig b/templates/forms/fields/tel/tel.html.twig index e63fc8f9..4c7762b4 100644 --- a/templates/forms/fields/tel/tel.html.twig +++ b/templates/forms/fields/tel/tel.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="tel" diff --git a/templates/forms/fields/text/text.html.twig b/templates/forms/fields/text/text.html.twig index 4a6f1d17..573dd892 100644 --- a/templates/forms/fields/text/text.html.twig +++ b/templates/forms/fields/text/text.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block prepend %} {% if field.prepend %} diff --git a/templates/forms/fields/textarea/textarea.html.twig b/templates/forms/fields/textarea/textarea.html.twig index dd467b07..6e9f595a 100644 --- a/templates/forms/fields/textarea/textarea.html.twig +++ b/templates/forms/fields/textarea/textarea.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input %}
diff --git a/templates/forms/fields/time/time.html.twig b/templates/forms/fields/time/time.html.twig index 7c859be0..bf119983 100644 --- a/templates/forms/fields/time/time.html.twig +++ b/templates/forms/fields/time/time.html.twig @@ -1,20 +1,6 @@ {% extends "forms/field.html.twig" %} -{% block label %} - {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} - {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} - {% endif %} -{% endblock %} +{% use "forms/fields/label/label.html.twig" %} {% block input_attributes %} type="time" From ece664d2a45a2050ff34b3bf4d1a8b2e895ff350 Mon Sep 17 00:00:00 2001 From: irauschek Date: Fri, 30 Aug 2019 02:29:31 +0200 Subject: [PATCH 3/3] Use unified lang translation filter from Grav 1.6rc2 --- templates/forms/default/data.html.twig | 12 ++---------- templates/forms/fields/checkbox/checkbox.html.twig | 12 ++---------- templates/forms/fields/label/label.html.twig | 12 ++---------- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/templates/forms/default/data.html.twig b/templates/forms/default/data.html.twig index 5e19b7e4..c1cfbc14 100644 --- a/templates/forms/default/data.html.twig +++ b/templates/forms/default/data.html.twig @@ -11,17 +11,9 @@
{% block field_label %} {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }}: - {% else %} - {{ field.label|t|markdown(false) }}: - {% endif %} + {{ field.label|t|markdown(false) }}: {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }}: - {% else %} - {{ field.label|t|e }}: - {% endif %} + {{ field.label|t|e }}: {% endif %} {% endblock %} diff --git a/templates/forms/fields/checkbox/checkbox.html.twig b/templates/forms/fields/checkbox/checkbox.html.twig index 4c2653b8..64cad540 100644 --- a/templates/forms/fields/checkbox/checkbox.html.twig +++ b/templates/forms/fields/checkbox/checkbox.html.twig @@ -26,17 +26,9 @@ /> diff --git a/templates/forms/fields/label/label.html.twig b/templates/forms/fields/label/label.html.twig index 1ba893e6..409efd8a 100644 --- a/templates/forms/fields/label/label.html.twig +++ b/templates/forms/fields/label/label.html.twig @@ -1,15 +1,7 @@ {% block label %} {% if field.markdown %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|markdown(false) }} - {% else %} - {{ field.label|t|markdown(false) }} - {% endif %} + {{ field.label|t|markdown(false) }} {% else %} - {% if grav.twig.twig.filters['tu'] is defined %} - {{ field.label|tu|e }} - {% else %} - {{ field.label|t|e }} - {% endif %} + {{ field.label|t|e }} {% endif %} {% endblock %}