diff --git a/index.php b/index.php index e0dfd752..682664c3 100644 --- a/index.php +++ b/index.php @@ -23,7 +23,7 @@ if(version_compare(PHP_VERSION, '5.6.0', '<')) { /* Set locale to French */ date_default_timezone_set('Europe/Paris'); -setlocale (LC_TIME, 'fra_FRA', 'french'); +setlocale (LC_TIME, 'fr_FR.utf8','fra'); /** * Initialisation de Zwii diff --git a/module/blog/blog.php b/module/blog/blog.php index 53604c12..36d178ca 100644 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -127,7 +127,7 @@ class blog extends common { // Met en forme le tableau $comment = $comments[$commentIds[$i]]; self::$comments[] = [ - utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn'])), + strftime('%d %B %Y - %H:%M', $comment['createdOn']), $comment['content'], $comment['userId'] ? $this->getData(['user', $comment['userId'], 'firstname']) . ' ' . $this->getData(['user', $comment['userId'], 'lastname']) : $comment['author'], template::button('blogCommentDelete' . $commentIds[$i], [ @@ -191,9 +191,9 @@ class blog extends common { self::$articles[] = [ $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'title']), // date('d/m/Y H:i', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])), - utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))) + strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])) .' à '. - utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn']))), + strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $articleIds[$i], 'publishedOn'])), self::$states[$this->getData(['module', $this->getUrl(0), $articleIds[$i], 'state'])], template::button('blogConfigEdit' . $articleIds[$i], [ 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $articleIds[$i] . '/' . $_SESSION['csrf'], diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 848418f6..147583d1 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -2,8 +2,8 @@
- getData(['module', $this->getUrl(0), $this->getUrl(1), 'publishedOn']))); ?> - à getData(['module', $this->getUrl(0), $this->getUrl(1), 'publishedOn']))); ?> + getData(['module', $this->getUrl(0), $this->getUrl(1), 'publishedOn'])); ?> + à getData(['module', $this->getUrl(0), $this->getUrl(1), 'publishedOn'])); ?>
getData(['module', $this->getUrl(0), $this->getUrl(1), 'pictureSize']) === null ? '100' : $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'pictureSize']); ?> getData(['module', $this->getUrl(0), $this->getUrl(1), 'hidePicture']) == false) { echo '' . $this->getData(['module', $this->getUrl(0), $this->getUrl(1), 'picture']) . ''; } ?> @@ -110,7 +110,7 @@ - le + le diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php index 3734b479..7265af36 100644 --- a/module/blog/view/index/index.php +++ b/module/blog/view/index/index.php @@ -34,7 +34,7 @@
- +

... diff --git a/module/news/news.php b/module/news/news.php index ac221426..4499028c 100644 --- a/module/news/news.php +++ b/module/news/news.php @@ -91,9 +91,9 @@ class news extends common { // Met en forme le tableau self::$news[] = [ $this->getData(['module', $this->getUrl(0), $newsIds[$i], 'title']), - utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $newsIds[$i], 'publishedOn']))) + strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), $newsIds[$i], 'publishedOn'])) .' à '. - utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $newsIds[$i], 'publishedOn']))), + strftime('%H:%M', $this->getData(['module', $this->getUrl(0), $newsIds[$i], 'publishedOn'])), self::$states[$this->getData(['module', $this->getUrl(0), $newsIds[$i], 'state'])], template::button('newsConfigEdit' . $newsIds[$i], [ 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $newsIds[$i]. '/' . $_SESSION['csrf'], diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php index 6abb910c..7c34a1da 100644 --- a/module/news/view/index/index.php +++ b/module/news/view/index/index.php @@ -4,16 +4,16 @@ $news): ?>

-

+
- - + + - getData(['user', $news['userId'], 'firstname']) . ' ' . $this->getData(['user', $news['userId'], 'lastname']); ?>
-
+