Fix : modification affichage mois

2018-09-20 11:36:27 +02:00
1 changed files with 5 additions and 2 deletions
@@ -15,11 +15,14 @@
        </div>
        <div class="col s12 titleDateCareer">
            {% if c.beginMonthCareer is defined %}
+            {% set fullDate = '2018-' ~ c.beginMonthCareer ~ '-01' %}
                {% if c.beginMonthCareer matches '/^\\d+$/' %}
-                <span>{{ date('2018-' ~ c.beginMonthCareer ~ '-01')|date('F') }} {{ c.beginYearCareer }}</span>
+                <span>{{ fullDate|datetime  }} {{ c.beginYearCareer }}</span>
                {% endif %}
            {% endif %}
-            <span>- {% if c.actualJobCareer is defined and c.actualJobCareer == true %}Aujourd'hui{% else %} {% if c.beginMonthCareer matches '/^\\d+$/' %}{{ date('2018-' ~ c.endMonthCareer ~ '-01')|date('F') }}{% endif %} {{ c.endYearCareer }}{% endif %}, {{ c.placeCareer }}
+            <span>-
+                {% if c.actualJobCareer is defined and c.actualJobCareer == true %}
+                Aujourd'hui{% else %} {% set fullDateEnd = '2018-' ~ c.endMonthCareer ~ '-01' %} {% if c.endMonthCareer matches '/^\\d+$/' %}{{ fullDateEnd|datetime  }}{% endif %} {{ c.endYearCareer }}{% endif %}, {{ c.placeCareer }}
            </span>
        </div>
        <div class="col s12">