EZP-31719: Verbatim HTML in end of life information on Dashboard (#55)

ezsystems · Jul 13, 2020 · 0042e56 · 0042e56
1 parent af5d000
commit 0042e56
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/Resources/translations/dashboard.en.xlf b/Resources/translations/dashboard.en.xlf
@@ -15,13 +15,13 @@
         <source><![CDATA[Tip: If you upgrade to eZ Platform Enterprise you'll get access to:
                         <a target="_blank" href="%license_url%">A business friendly license</a>,
                         <a target="_blank" href="%ee_product_url%">several productivity features</a>,
-                        <a target="_blank" href="%support_service_url%">professional Support</a> and
-                        <a target="_blank" href="%service_life_url%">longer maintenance periode of your release</a>.]]></source>
+                        <a target="_blank" href="%support_service_url%">professional support</a> and a
+                        <a target="_blank" href="%service_life_url%">longer maintenance period of your release</a>.]]></source>
         <target state="new"><![CDATA[Tip: If you upgrade to eZ Platform Enterprise you'll get access to:
                         <a target="_blank" href="%license_url%">A business friendly license</a>,
                         <a target="_blank" href="%ee_product_url%">several productivity features</a>,
-                        <a target="_blank" href="%support_service_url%">professional Support</a> and
-                        <a target="_blank" href="%service_life_url%">longer maintenance periode of your release</a>.]]></target>
+                        <a target="_blank" href="%support_service_url%">professional support</a> and a
+                        <a target="_blank" href="%service_life_url%">longer maintenance period of your release</a>.]]></target>
         <note>key: dashboard.ez_version.community_end_of_maintenance_upgrade</note>
       </trans-unit>
       <trans-unit id="7eb6ab2973439efa8ff820310952e02bc81209cb" resname="dashboard.ez_version.community_severity_non">

diff --git a/Resources/views/themes/admin/dashboard/block/ez.html.twig b/Resources/views/themes/admin/dashboard/block/ez.html.twig
@@ -15,8 +15,11 @@
     {% if not ez.release %}
         {% set severity = 1 %}
         <div class="alert alert-warning mb-0 mt-3" role="alert">
-            {{ 'dashboard.ez_version.release_not_determined'|trans|desc("The system could not find your <code>composer.lock</code> file. It's needed to determine information about
-            your eZ install, and recommended to be kept on project development to make sure same package versions are used across all environments.")}}
+            {{ 'dashboard.ez_version.release_not_determined'|trans
+            |desc("The system could not find your <code>composer.lock</code> file. It's needed to determine information about
+                your eZ installation. It is recommended to keep it during project development to make sure the same package versions are
+                used across all environments.")
+            |raw }}
         </div>
     {% elseif ez.stability != 'stable'  %}
         {% set severity = 1 %}
@@ -60,8 +63,13 @@
             {# In the future with retrival of info from updates.ez.no we can detect missing (public) security fixes and then let this become an error #}
             {% set severity = 1 %}
             <div class="alert alert-warning mb-0 mt-3" role="alert">
-                {{ 'dashboard.ez_version.community_end_of_maintenance'|trans({'%release%': ez.release, '%update_url%': urls['update']})
-                |desc("Unfortunately %release% open source version has reached end of life, <a target=\"_blank\" href=\"%update_url%\">please upgrade</a>.")}}
+                {{ 'dashboard.ez_version.community_end_of_maintenance'|trans({
+                    '%release%': ez.release,
+                    '%update_url%': urls['update']
+                })
+                |desc("Unfortunately %release% open source version has reached end of life,
+                    <a target=\"_blank\" href=\"%update_url%\">please upgrade</a>.")
+                |raw }}
                 <em>
                     {{ 'dashboard.ez_version.community_end_of_maintenance_upgrade'|trans({
                         '%license_url%': urls['license'],
@@ -72,8 +80,8 @@
                     |desc("Tip: If you upgrade to eZ Platform Enterprise you'll get access to:
                         <a target=\"_blank\" href=\"%license_url%\">A business friendly license</a>,
                         <a target=\"_blank\" href=\"%ee_product_url%\">several productivity features</a>,
-                        <a target=\"_blank\" href=\"%support_service_url%\">professional Support</a> and
-                        <a target=\"_blank\" href=\"%service_life_url%\">longer maintenance periode of your release</a>.")
+                        <a target=\"_blank\" href=\"%support_service_url%\">professional support</a> and a
+                        <a target=\"_blank\" href=\"%service_life_url%\">longer maintenance period of your release</a>.")
                     |raw }}
                 </em>
             </div>