From f31f5691fab8ba3e28ead4e9218fb2b44b0d868c Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Thu, 2 Jun 2016 14:52:40 +0200 Subject: [PATCH] Add missing commits. *Again* *grml* this is realy annoying. --- src/enko/RelativeDateParser/RelativeDateType1.php | 4 ++-- src/enko/RelativeDateParser/RelativeDateType2.php | 2 +- src/enko/RelativeDateParser/RelativeDateType3.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/enko/RelativeDateParser/RelativeDateType1.php b/src/enko/RelativeDateParser/RelativeDateType1.php index a04ff99..5ad37d2 100755 --- a/src/enko/RelativeDateParser/RelativeDateType1.php +++ b/src/enko/RelativeDateParser/RelativeDateType1.php @@ -9,7 +9,7 @@ class RelativeDateType1 { private $month_or_year = -1; public static function getRegex() { - return DateTranslator::getInstance()->translate('/([Erster|Zweiter|Dritter|Letzter]+) ([Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag]+) des ([Monats|Jahres]+)/im'); + return DateTranslator::getInstance()->translate('/^([Erster|Zweiter|Dritter|Letzter]+) ([Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag]+) des ([Monats|Jahres]+)$/im'); } private function getOrdinal() { @@ -50,7 +50,7 @@ class RelativeDateType1 { public function getCurrent(\DateTime $now) { $date = new \DateTime(); - $date->setTimestamp (strtotime (sprintf ('%s %s %s %d', $this->getOrdinal (), $this->getDay (), $now->format('F'), $now->format('Y')))); + $date->setTimestamp (strtotime (sprintf ('%s %s of %s %d', $this->getOrdinal (), $this->getDay (), $now->format('F'), $now->format('Y')))); $date->setTime($now->format('H'),$now->format('i')); return $date; diff --git a/src/enko/RelativeDateParser/RelativeDateType2.php b/src/enko/RelativeDateParser/RelativeDateType2.php index 8aaa6ce..65b4300 100755 --- a/src/enko/RelativeDateParser/RelativeDateType2.php +++ b/src/enko/RelativeDateParser/RelativeDateType2.php @@ -8,7 +8,7 @@ class RelativeDateType2 { private $days_or_week = -1; public static function getRegex() { - return DateTranslator::getInstance()->translate('/Alle (\d+) ([Wochen|Tage]+)/im'); + return DateTranslator::getInstance()->translate('/^Alle (\d+) ([Wochen|Tage]+)$/im'); } public function getCurrent(\DateTime $now) { diff --git a/src/enko/RelativeDateParser/RelativeDateType3.php b/src/enko/RelativeDateParser/RelativeDateType3.php index 6129ba0..b2612bd 100755 --- a/src/enko/RelativeDateParser/RelativeDateType3.php +++ b/src/enko/RelativeDateParser/RelativeDateType3.php @@ -13,7 +13,7 @@ class RelativeDateType3 { private $day = -1; public static function getRegex() { - return DateTranslator::getInstance()->translate('/Jeder (\d+)\. Tag eines Monats/im'); + return DateTranslator::getInstance()->translate('/^Jeder (\d+)\. Tag eines Monats$/im'); } private function getDay() {