From 46eb4b5fca7247f504804a2b80a21e0db52493b3 Mon Sep 17 00:00:00 2001
From: FAJ-Munich <60485740+FAJ-Munich@users.noreply.github.com>
Date: Wed, 6 Dec 2023 21:37:30 +0100
Subject: [PATCH 1/3] Adding colon after Commemoratio #3465

Grammatical correction; no colon for Latin && Sancti only
---
 web/cgi-bin/horas/specials.pl                  | 2 +-
 web/www/horas/English/Psalterium/Translate.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/cgi-bin/horas/specials.pl b/web/cgi-bin/horas/specials.pl
index 9a73cc5fbaa..6477a65a011 100644
--- a/web/cgi-bin/horas/specials.pl
+++ b/web/cgi-bin/horas/specials.pl
@@ -1606,7 +1606,7 @@ sub getcommemoratio {
   if (!$v) { $v = 'versus missing'; }
   postprocess_vr($v, $lang);
   our %prayers;
-  my $w = "!" . &translate("Commemoratio", $lang);
+	my $w = "!" . &translate("Commemoratio", $lang) . (($lang !~ /latin/i || $wday =~ /tempora/i) ? ':' : ''); # Adding : except for Latin Sancti which are in Genetiv
   $a =~ s/\s*\*\s*/ / unless ($version =~ /Monastic/i);
   $o =~ s/^(?:v. )?/v. /;
   $w .= " $rank[0]\nAnt. $a\n_\n$v\n_\n\$Oremus\n$o\n";
diff --git a/web/www/horas/English/Psalterium/Translate.txt b/web/www/horas/English/Psalterium/Translate.txt
index 94b8947a359..9c33a63d19f 100644
--- a/web/www/horas/English/Psalterium/Translate.txt
+++ b/web/www/horas/English/Psalterium/Translate.txt
@@ -182,7 +182,7 @@ Divine Office
 After
 
 [Commemoratio]
-Commemoration:
+Commemoration
 
 [Antiphona]
 Antiphon

From aa6689efbfdcc0bddb6d6f56512af7df522b9bd4 Mon Sep 17 00:00:00 2001
From: FAJ-Munich <60485740+FAJ-Munich@users.noreply.github.com>
Date: Wed, 6 Dec 2023 21:50:38 +0100
Subject: [PATCH 2/3] Closing #3465

Fixing commemoration headline on Saturdays (all rubrics) and Sundays Vespers (pre-1960) when the Sunday is giving way in concurrence
---
 web/cgi-bin/horas/horascommon.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/cgi-bin/horas/horascommon.pl b/web/cgi-bin/horas/horascommon.pl
index 05291ddf0e1..2989a378d0b 100644
--- a/web/cgi-bin/horas/horascommon.pl
+++ b/web/cgi-bin/horas/horascommon.pl
@@ -730,7 +730,7 @@ sub concurrence {
 			$vespera = 1;
 			$cvespera = 3;
 			$commemoratio = $winner;
-			$tomorrowname[2] = "Commemoratio: $cwrank[0]";
+			$tomorrowname[2] = "Commemoratio: $wrank[0]";
 			$winner = $cwinner;
 			$cwinner = $commemoratio;
 			@dayname = @tomorrowname;
@@ -743,7 +743,7 @@ sub concurrence {
 			$vespera = 3;
 			$cvespera = 1;
 			$commemoratio = $cwinner;
-			$dayname[2] = "Commemoratio: $wrank[0]";
+			$dayname[2] = "Commemoratio: $cwrank[0]";
 			$dayname[2] .= "<br>Vespera de præcedenti; commemoratio de sequenti Dominica";
 		} elsif ($flcrank == $flrank) {			# "flattend ranks" are equal => a capitulo
 			$commemoratio = $winner;

From c78ef65ec0548052fec27e34796551ce3d706318 Mon Sep 17 00:00:00 2001
From: FAJ-Munich <60485740+FAJ-Munich@users.noreply.github.com>
Date: Wed, 6 Dec 2023 22:18:57 +0100
Subject: [PATCH 3/3] Closing #3464

---
 web/cgi-bin/DivinumOfficium/Date.pm | 2 +-
 web/cgi-bin/horas/horascommon.pl    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/cgi-bin/DivinumOfficium/Date.pm b/web/cgi-bin/DivinumOfficium/Date.pm
index c054d3fd98e..5a1f1ae31d0 100644
--- a/web/cgi-bin/DivinumOfficium/Date.pm
+++ b/web/cgi-bin/DivinumOfficium/Date.pm
@@ -166,7 +166,7 @@ sub monthday {
   return '' if $month < 7;
 
   my $leapyear = leapyear $year;
-  my $day_of_year = date_to_ydays $day, $month, $year;
+  my $day_of_year = date_to_ydays($day, $month, $year);
   $day_of_year++ if $tomorrow;
 
   my $lit_month = 0;
diff --git a/web/cgi-bin/horas/horascommon.pl b/web/cgi-bin/horas/horascommon.pl
index 2989a378d0b..50a197b6da5 100644
--- a/web/cgi-bin/horas/horascommon.pl
+++ b/web/cgi-bin/horas/horascommon.pl
@@ -56,7 +56,6 @@ sub occurrence {
 	our($vespera, $cvespera);
 	our($tvesp, $svesp, $dayofweek);
 	our($C10);
-	our(%winner);
 	our(@dayname, @tomorrowname);
 	
 	# locals only
@@ -1057,7 +1056,7 @@ sub precedence {
 			$wm =~ s/\.txt/m$missanumber\.txt/i;
 			if ($missanumber && (-e "$datafolder/Latin/$wm")) { $winner = $wm; }
 		}
-		my $flag = ($winner =~ /tempora/i && $tvesp == 1) ? 1 : 0;
+		my $flag = ($winner =~ /tempora/i && $vespera == 1) ? 1 : 0;
 		%winner = %{officestring($lang1, $winner, $flag)};
 		
 		# In the feriae where the octave of the Epiphany used to be, the