Added: before and yesterday diffs

JanGalek · Apr 6, 2018 · 0431db6 · 0431db6
1 parent 964d2f5
commit 0431db6
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 83 deletions.
diff --git a/src/Galek/Utils/Calendar/Calendar.php b/src/Galek/Utils/Calendar/Calendar.php
@@ -402,19 +402,31 @@ public function getDateTimeFormat(): string
     public function werbDif(): string
     {
         $curDate = new Calendar();
-        $diff = $this->diff($curDate)->days;
+        $date = clone $this;
+        $date->setTime(0,0,0,0);
+        $curDate->setTime(0,0,0,0);
+		$diff = $date->diff($curDate)->days;
+
 
 		$local = $this->configuration->getLocalization()->getDifference();
 
-        if ($diff === 0) {
-        	return $local['today'];
-		} elseif ($diff === 1) {
-			return $local['tomorrow'];
-        } elseif ($diff === 2) {
-			return $local['afterTomorrow'];
-		} elseif ($diff < 5) {
-        	return $local['after'] . ' ' . $diff . ' ' . $local['twoDays'];
-        }
+		if ($date >= $curDate) {
+			if ($diff === 0) {
+				return $local['today'];
+			} elseif ($diff === 1) {
+				return $local['tomorrow'];
+			} elseif ($diff === 2) {
+				return $local['afterTomorrow'];
+			} elseif ($diff < 5) {
+				return $local['after'] . ' ' . $diff . ' ' . $local['twoDays'];
+			}
+		} else {
+			if ($diff === 1) {
+				return $local['yesterday'];
+			} else {
+				return $local[ 'before' ] . ' ' . $diff . ' ' . $local[ 'twoDays' ];
+			}
+		}
 
 		return $local['after'] . ' ' . $diff . ' ' . $local['fiveDays'];
     }

diff --git a/src/Galek/Utils/Calendar/Localization/cs.neon b/src/Galek/Utils/Calendar/Localization/cs.neon
@@ -58,6 +58,8 @@ inflexion:
 			7: 'sobotou'
 
 difference:
+	before: 'před'
+	yesterday: 'včera'
 	today: 'dnes'
 	tomorrow: 'zítra'
 	afterTomorrow: 'pozítří'

diff --git a/src/Galek/Utils/Calendar/Localization/en.neon b/src/Galek/Utils/Calendar/Localization/en.neon
@@ -58,6 +58,8 @@ inflexion:
 			7: 'saturday'
 
 difference:
+	before: 'before'
+	yesterday: 'yesterday'
 	today: 'today'
 	tomorrow: 'tomorrow'
 	afterTomorrow: 'after tomorrow'

diff --git a/src/Galek/Utils/Calendar/Localization/sk.neon b/src/Galek/Utils/Calendar/Localization/sk.neon
@@ -58,6 +58,8 @@ inflexion:
 			7: 'sobotou'
 
 difference:
+	before: 'pred'
+	yesterday: 'včera'
 	today: 'dnes'
 	tomorrow: 'zajtra'
 	afterTomorrow: 'pozajtra'

diff --git a/tests/CalendarTests/Shippers.phpt b/tests/CalendarTests/Shippers.phpt
@@ -77,7 +77,7 @@ public const CONFIG = [
 
 	public function testCustom1()
 	{
-		$configurator = new \GalekTests\Calendar\Models\Configurator(self::CONFIG);
+		$configurator = new \Galek\Utils\Calendar\Configuration\Configurator(self::CONFIG);
 
 		$date = new Calendar('2018-03-29 12:00');
 

diff --git a/tests/CalendarTests/models/Configurator.php b/tests/CalendarTests/models/Configurator.php
diff --git a/tests/CalendarTests/models/Shipper.php b/tests/CalendarTests/models/Shipper.php
diff --git a/tests/CalendarTests/models/Shippers.php b/tests/CalendarTests/models/Shippers.php