Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Today's easy fixes #3467

Merged
merged 4 commits into from
Dec 6, 2023
Merged

Today's easy fixes #3467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46eb4b5
Adding colon after Commemoratio #3465
FAJ-Munich Dec 6, 2023
aa6689e
Closing #3465
FAJ-Munich Dec 6, 2023
c78ef65
Closing #3464
FAJ-Munich Dec 6, 2023
b4f2e3c
Merge remote-tracking branch 'upstream/master'
FAJ-Munich Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/cgi-bin/DivinumOfficium/Date.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions web/cgi-bin/horas/horascommon.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ sub occurrence {
our($vespera, $cvespera);
our($tvesp, $svesp, $dayofweek);
our($C10);
our(%winner);
our(@dayname, @tomorrowname);

# locals only
Expand Down Expand Up @@ -730,7 +729,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;
Expand All @@ -743,7 +742,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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion web/cgi-bin/horas/specials.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion web/www/horas/English/Psalterium/Translate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ Divine Office
After

[Commemoratio]
Commemoration:
Commemoration

[Antiphona]
Antiphon
Expand Down