Merge branch 'master' into bootstrap5

2025-08-21 15:13:50 +00:00 · 2021-07-30 20:31:46 +02:00
parent 532d4aa164 f734210db5
commit 65fe9ab784
54 changed files with 1371 additions and 575 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -63,7 +63,7 @@
                </time>
                {%- if options['addAge'] -%}
                    <span class="age">
-                        {{ person.age ~ ((person.age > 1) ? ' ans' : ' an') }}
+                        {{ 'years_old'|trans({ 'age': person.age }) }}
                    </span>
                {%- endif -%}
            </p>