From 208885b8b73730c18337883f9927fef4bf913577 Mon Sep 17 00:00:00 2001 From: Jonas Verhaeghe Date: Fri, 13 Nov 2015 09:49:40 +0100 Subject: [PATCH] UIV-1526 add new formatting to prevent wrong year --- src/Period/LargePeriodHTMLFormatter.php | 2 +- src/Period/LargePeriodPlainTextFormatter.php | 2 +- src/Period/MediumPeriodHTMLFormatter.php | 2 +- src/Period/MediumPeriodPlainTextFormatter.php | 2 +- src/Timestamps/LargeTimestampsHTMLFormatter.php | 2 +- src/Timestamps/LargeTimestampsPlainTextFormatter.php | 2 +- src/Timestamps/MediumTimestampsHTMLFormatter.php | 2 +- src/Timestamps/MediumTimestampsPlainTextFormatter.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Period/LargePeriodHTMLFormatter.php b/src/Period/LargePeriodHTMLFormatter.php index 52156b6..fe695bf 100644 --- a/src/Period/LargePeriodHTMLFormatter.php +++ b/src/Period/LargePeriodHTMLFormatter.php @@ -99,7 +99,7 @@ protected function generateDates($date_from, $date_to) IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $dateFromString = $date_from; $dateFrom = strtotime($dateFromString); diff --git a/src/Period/LargePeriodPlainTextFormatter.php b/src/Period/LargePeriodPlainTextFormatter.php index e614371..3b19b44 100644 --- a/src/Period/LargePeriodPlainTextFormatter.php +++ b/src/Period/LargePeriodPlainTextFormatter.php @@ -89,7 +89,7 @@ protected function generateDates($date_from, $date_to) IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $dateFromString = $date_from; $dateFrom = strtotime($dateFromString); diff --git a/src/Period/MediumPeriodHTMLFormatter.php b/src/Period/MediumPeriodHTMLFormatter.php index f5d9bcc..aff43c1 100644 --- a/src/Period/MediumPeriodHTMLFormatter.php +++ b/src/Period/MediumPeriodHTMLFormatter.php @@ -22,7 +22,7 @@ public function format( IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $fmtDay = new IntlDateFormatter( diff --git a/src/Period/MediumPeriodPlainTextFormatter.php b/src/Period/MediumPeriodPlainTextFormatter.php index b5d0d4f..484ed9d 100644 --- a/src/Period/MediumPeriodPlainTextFormatter.php +++ b/src/Period/MediumPeriodPlainTextFormatter.php @@ -22,7 +22,7 @@ public function format( IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $fmtDay = new IntlDateFormatter( diff --git a/src/Timestamps/LargeTimestampsHTMLFormatter.php b/src/Timestamps/LargeTimestampsHTMLFormatter.php index 8e2aed7..2b747da 100644 --- a/src/Timestamps/LargeTimestampsHTMLFormatter.php +++ b/src/Timestamps/LargeTimestampsHTMLFormatter.php @@ -28,7 +28,7 @@ public function __construct() IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $this->fmtWeekDayLong = new IntlDateFormatter( diff --git a/src/Timestamps/LargeTimestampsPlainTextFormatter.php b/src/Timestamps/LargeTimestampsPlainTextFormatter.php index ed306c6..1ad8e39 100644 --- a/src/Timestamps/LargeTimestampsPlainTextFormatter.php +++ b/src/Timestamps/LargeTimestampsPlainTextFormatter.php @@ -28,7 +28,7 @@ public function __construct() IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $this->fmtWeekDayLong = new IntlDateFormatter( diff --git a/src/Timestamps/MediumTimestampsHTMLFormatter.php b/src/Timestamps/MediumTimestampsHTMLFormatter.php index b578c0d..1bdaa55 100644 --- a/src/Timestamps/MediumTimestampsHTMLFormatter.php +++ b/src/Timestamps/MediumTimestampsHTMLFormatter.php @@ -24,7 +24,7 @@ public function __construct() IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $this->fmtDay = new IntlDateFormatter( diff --git a/src/Timestamps/MediumTimestampsPlainTextFormatter.php b/src/Timestamps/MediumTimestampsPlainTextFormatter.php index cf4da8c..984d0ec 100644 --- a/src/Timestamps/MediumTimestampsPlainTextFormatter.php +++ b/src/Timestamps/MediumTimestampsPlainTextFormatter.php @@ -24,7 +24,7 @@ public function __construct() IntlDateFormatter::FULL, date_default_timezone_get(), IntlDateFormatter::GREGORIAN, - 'd MMMM Y' + 'd MMMM yyyy' ); $this->fmtDay = new IntlDateFormatter(