Merge branch '4.4' into 5.1

javiereguiluz · javiereguiluz · commit 2ef47af22666 · 2020-08-31T10:09:37.000+02:00
* 4.4:
  Update Symfony browserlists reccomendation to browserlists standard.
  Fixed sample code syntax
  [Templating] Explain the hinclude.js attributes
  [Translation] The 'other' key is mandatory in ICU 'select'
diff --git a/frontend/encore/postcss.rst b/frontend/encore/postcss.rst
@@ -63,6 +63,16 @@ The ``autoprefixer`` (and many other tools) need to know what browsers you want
 support. The best-practice is to configure this directly in your ``package.json``
 (so that all the tools can read this):
 
+.. code-block:: diff
+
+    {
+    +  "browserslist": [
+    +    "defaults"
+    +  ]
+    }
+
+The ``defaults`` option is reccommended for most users and would be equivilant to the following browserslist.
+
 .. code-block:: diff
 
     {
diff --git a/templating/hinclude.rst b/templating/hinclude.rst
@@ -82,4 +82,16 @@ Or you can also specify a string to display as the default content:
 
     {{ render_hinclude(controller('...'), {default: 'Loading...'}) }}
 
+Use the ``attributes`` option to define the value of hinclude.js options:
+
+.. code-block:: twig
+
+    {# by default, cross-site requests don't use credentials such as cookies, authorization
+       headers or TLS client certificates; set this option to 'true' to use them #}
+    {{ render_hinclude(controller('...'), {attributes: {data-with-credentials: 'true'}}) }}
+
+    {# by default, the JavaScript code included in the loaded contents is not run;
+       set this option to 'true' to run that JavaScript code #}
+    {{ render_hinclude(controller('...'), {attributes: {evaljs: 'true'}}) }}
+
 .. _`hinclude.js`: http://mnot.github.io/hinclude/
diff --git a/translation/message_format.rst b/translation/message_format.rst
@@ -96,6 +96,8 @@ typical usage of this is gender:
     .. code-block:: yaml
 
         # translations/messages+intl-icu.en.yaml
+
+        # the 'other' key is required, and is selected if no other case matches
         invitation_title: >-
             {organizer_gender, select,
                 female {{organizer_name} has invited you for her party!}
@@ -112,6 +114,7 @@ typical usage of this is gender:
                 <body>
                     <trans-unit id="invitation_title">
                         <source>invitation_title</source>
+                        <!-- the 'other' key is required, and is selected if no other case matches -->
                         <target>{organizer_gender, select,
                             female {{organizer_name} has invited you for her party!}
                             male {{organizer_name} has invited you for his party!}
@@ -126,6 +129,7 @@ typical usage of this is gender:
 
         // translations/messages+intl-icu.en.php
         return [
+            // the 'other' key is required, and is selected if no other case matches
             'invitation_title' => '{organizer_gender, select,
                 female {{organizer_name} has invited you for her party!}
                 male   {{organizer_name} has invited you for his party!}
