From 051b7d743489be5311633803742481b303ad510c Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 4 Jan 2021 12:50:41 -0500 Subject: [PATCH] [FIX] Using ISO-8601:1988 year standard (%g) instead of dividing year by 100 (%G) --- 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 39d67d0c..d7164a32 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("%g", $this->timestamp) === ovk_strftime_safe("%g")) { # 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 %g ", $this->timestamp) . tr("time_at_sp") . ovk_strftime_safe(" %X", $this->timestamp); } }