From 2a4ea41d56bcf33059b28b2fda85c18dd1e4c25c Mon Sep 17 00:00:00 2001
From: Gary Turner <gary.turner@talk-straight.com>
Date: Mon, 21 Nov 2022 09:25:47 +0000
Subject: [PATCH] Add reserved keywords for year/month before and after

---
 app/Utils/Helpers.php | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index e512ee3cb73b..531a77ef9fe5 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -134,6 +134,30 @@ class Helpers
 
         $replacements = [
             'literal' => [
+                ':MONTH_BEFORE' => \sprintf(
+                    '%s %s %s',
+                    Carbon::now()->subMonth(1)->translatedFormat($entity->date_format()),
+                    ctrans('texts.to'),
+                    Carbon::now()->subDay(1)->translatedFormat($entity->date_format()),
+                ),
+                ':YEAR_BEFORE' => \sprintf(
+                    '%s %s %s',
+                    Carbon::now()->subYear(1)->translatedFormat($entity->date_format()),
+                    ctrans('texts.to'),
+                    Carbon::now()->subDay(1)->translatedFormat($entity->date_format()),
+                ),
+                ':MONTH_AFTER' => \sprintf(
+                    '%s %s %s',
+                    Carbon::now()->translatedFormat($entity->date_format()),
+                    ctrans('texts.to'),
+                    Carbon::now()->addMonth(1)->subDay(1)->translatedFormat($entity->date_format()),
+                ),
+                ':YEAR_AFTER' => \sprintf(
+                    '%s %s %s',
+                    Carbon::now()->translatedFormat($entity->date_format()),
+                    ctrans('texts.to'),
+                    Carbon::now()->addYear(1)->subDay(1)->translatedFormat($entity->date_format()),
+                ),
                 ':MONTHYEAR' => \sprintf(
                     '%s %s',
                     Carbon::createFromDate(now()->month)->translatedFormat('F'),
@@ -150,15 +174,15 @@ class Helpers
                 ),
                 ':WEEK_AHEAD' => \sprintf(
                     '%s %s %s',
-                    Carbon::now()->addDays(6)->translatedFormat($entity->date_format()),
+                    Carbon::now()->addDays(7)->translatedFormat($entity->date_format()),
                     ctrans('texts.to'),
                     Carbon::now()->addDays(13)->translatedFormat($entity->date_format())
                 ),
                 ':WEEK' => \sprintf(
                     '%s %s %s',
-                    Carbon::now()->subDays(7)->translatedFormat($entity->date_format()),
+                    Carbon::now()->translatedFormat($entity->date_format()),
                     ctrans('texts.to'),
-                    Carbon::now()->addDays(13)->translatedFormat($entity->date_format())
+                    Carbon::now()->addDays(6)->translatedFormat($entity->date_format())
                 ),
             ],
             'raw' => [