From b0a843f17a232674cea8dbe739c1648791ddc033 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 4 Jan 2021 12:54:57 -0500 Subject: [PATCH] wait i am retarded --- Web/Util/DateTime.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Web/Util/DateTime.php b/Web/Util/DateTime.php index d7164a32..4e01d5f2 100644 --- a/Web/Util/DateTime.php +++ b/Web/Util/DateTime.php @@ -32,10 +32,10 @@ class DateTime return $diff->i === 5 ? tr("time_exactly_five_minutes_ago") : tr("time_minutes_ago", $diff->i); } else if($this->timestamp >= strtotime("-1day midnight")) { # Yesterday return tr("time_yesterday") . tr("time_at_sp") . ovk_strftime_safe("%X", $this->timestamp); - } else if(ovk_strftime_safe("%g", $this->timestamp) === ovk_strftime_safe("%g")) { # In this year + } else if(ovk_strftime_safe("%Y", $this->timestamp) === ovk_strftime_safe("%Y")) { # In this year return ovk_strftime_safe("%e %h ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %R %p", $this->timestamp); } else { - return ovk_strftime_safe("%e %B %g ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %X", $this->timestamp); + return ovk_strftime_safe("%e %B %Y ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %X", $this->timestamp); } }