Compare commits

..

No commits in common. "f03bde7c5036e3594244462df5364f9ff97bd28e" and "611afb7944d2ed2498121100a50ba296468d09e4" have entirely different histories.

2 changed files with 5 additions and 21 deletions

View File

@ -265,24 +265,7 @@ final class MDPlausi {
*/ */
private function _evaluateProductionAfterPostproduction():void { private function _evaluateProductionAfterPostproduction():void {
if ($this->_post_production->latest_event_type !== 0 if ($this->_post_production->earliest_event_type !== 0
&& $this->_production->earliest_event_type !== 0
&& $this->_post_production->latest < $this->_production->earliest) {
$message = $this->_tlLoader->tl("eventtype_name", "eventname", (string)$this->_post_production->latest_event_type);
$message .= $this->_post_production->formulateMessagePartForLatest($this->_tlLoader);
$message .= ' ' . strtolower($this->_tlLoader->tl("quality", "quality", "before")) . ' ' . $this->_tlLoader->tl("eventtype_name", "eventname", (string)$this->_production->earliest_event_type);
$message .= $this->_production->formulateMessagePartForEarliest($this->_tlLoader);
$this->_messageList[] = $message;
$this->_hasCertainWarnings = true;
}
else if ($this->_post_production->earliest_event_type !== 0
&& $this->_production->earliest_event_type !== 0 && $this->_production->earliest_event_type !== 0
&& $this->_post_production->earliest < $this->_production->earliest) { && $this->_post_production->earliest < $this->_production->earliest) {
@ -290,11 +273,12 @@ final class MDPlausi {
$message .= $this->_post_production->formulateMessagePartForEarliest($this->_tlLoader); $message .= $this->_post_production->formulateMessagePartForEarliest($this->_tlLoader);
$message .= ' ' . strtolower($this->_tlLoader->tl("quality", "quality", "before_possibly")) . ' ' . $this->_tlLoader->tl("eventtype_name", "eventname", (string)$this->_production->earliest_event_type); $message .= ' ' . strtolower($this->_tlLoader->tl("quality", "quality", "before")) . ' ' . $this->_tlLoader->tl("eventtype_name", "eventname", (string)$this->_production->earliest_event_type);
$message .= $this->_production->formulateMessagePartForEarliest($this->_tlLoader); $message .= $this->_production->formulateMessagePartForEarliest($this->_tlLoader);
$this->_messageList[] = $message; $this->_messageList[] = $message;
$this->_hasCertainWarnings = true;
} }

View File

@ -37,8 +37,8 @@ final class MDPlausiEvent {
if (empty($time)) return ['earliest' => false, 'latest' => false]; if (empty($time)) return ['earliest' => false, 'latest' => false];
// 20, -1, 233, -233, 2005, -2005 // 2005
if (in_array(strlen($time), [2, 3, 4, 5], true) and is_numeric(substr($time, 1))) { if (in_array(strlen($time), [4, 5], true) and is_numeric(substr($time, 1))) {
return [ return [
'earliest' => strtotime($time . '-01-01'), 'earliest' => strtotime($time . '-01-01'),
'latest' => strtotime($time . '-12-31'), 'latest' => strtotime($time . '-12-31'),