Merge branch 'release/2.0.9'

getgrav · Jan 24, 2017 · 164f60a · 164f60a
2 parents fe62dc9 + 115f6cc
commit 164f60a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.0.9
+## 01/24/2017
+
+1. [](#bugfix)
+    * Translate the labels in data.html.twig [https://github.com/getgrav/grav-plugin-comments/issues/38](https://github.com/getgrav/grav-plugin-comments/issues/38)
+    * Fixed file input when `System` > `Twig` > `Autoescape` is set to `Yes`
+
 # v2.0.8
 ## 12/13/2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Form
-version: 2.0.8
+version: 2.0.9
 description: Enables the forms handling
 icon: check-square
 author:

diff --git a/templates/forms/default/data.html.twig b/templates/forms/default/data.html.twig
@@ -4,7 +4,7 @@
         {% block field %}
             <div>
                 {% block field_label %}
-                    <strong>{{ field.label }}</strong>:
+                    <strong>{{ field.label|t }}</strong>:
                 {% endblock %}
                 {% block field_value %}
                     {{ string(form.value(field.name ?? index))|nl2br }}

diff --git a/templates/forms/fields/file/file.html.twig b/templates/forms/fields/file/file.html.twig
@@ -77,7 +77,7 @@
 
     {% do assets.addJs('plugin://form/assets/form.min.js', { 'group': 'bottom', 'loading': 'defer' }) %}
     {% do assets.addCss('plugin://form/assets/dropzone.min.css', { 'group': 'form' }) %}
-    {{ assets.css('form') }}
+    {{ assets.css('form')|raw }}
     {% do assets.addInlineJs("
     window.GravForm = window.GravForm || {};
     window.GravForm.config = {