Merge branch 'hotline#57574_orthographe_des_jours_de_la_semaine' into 'stable'

#57574 : correction orthographe des jours de la semaine

See merge request !2106

VERSIONS_HOTLINE/57574

+ - ticket #57574 : Orthographe des jours de la semaine (tous les lundis, mardis ...)
\ No newline at end of file

library/ZendAfi/View/Helper/TagArticleEvent.php

@@ -94,9 +94,9 @@ class ZendAfi_View_Helper_TagArticleEvent extends Zend_View_Helper_HtmlElement {
 
     $textual_days = '';
     foreach($days as $day)
-      $textual_days.= $this->numericDayToTextual($day) . ', ';
+      $textual_days.= $this->numericDayToTextual($day) . $this->view->_('s, ');
 
-    return substr($textual_days, 0, -2) . $this->view->_('s et ') . $last;
+    return substr($textual_days, 0, -2) . $this->view->_(' et ') . $last;
   }
 
 

tests/library/ZendAfi/View/Helper/TagArticleEventTest.php

@@ -134,6 +134,17 @@ class TagArticleEventTest extends ViewHelperTestCase {
   }
 
 
+
+    /** @test */
+  public function withMondayThuesdayThursdayAndSaturdayPickShouldAnswersTousLesLundisMardisMercredisEtTousLesSamedi() {
+    $this->article
+      ->setEventsDebut('2011-09-05 08:00')
+      ->setEventsFin('2011-10-05 10:00')
+      ->setPickDay('1,2,4,6');
+    $this->assertTagContains('Les lundis, mardis, jeudis et samedis du 5 septembre au 5 octobre 2011');
+  }
+
+
   /** @test */
   public function withAllDaysPickShouldAnswersTousLesJours() {
     $this->article