Merge remote-tracking branch 'upstream/master'

fiapps · Nov 16, 2024 · 569703a · 569703a
2 parents a1010c1 + 265e709
commit 569703a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/web/cgi-bin/horas/specmatins.pl b/web/cgi-bin/horas/specmatins.pl
@@ -68,10 +68,8 @@ sub invitatorium {
   postprocess_ant($ant, $lang);
   my @ant = split('\*', $ant);
   my $ant2 = "Ant. $ant[1]";
-
-  my $invitpath = "Psalterium/Invitatorium.txt";
-  $invitpath =~ s/Psalterium/PiusXII/ if ($lang eq 'Latin' && $psalmvar);
-  $fname = checkfile($lang, $invitpath);
+  $lang = 'Latin-Bea' if $lang eq 'Latin' && $psalmvar;
+  my $fname = checkfile($lang, 'Psalterium/Invitatorium.txt');
 
   if (my @a = do_read($fname)) {
     $_ = join("\n", @a);

diff --git a/...Bea/Psalterium/Psalmorum/Invitatorium.txt → ...ras/Latin-Bea/Psalterium/Invitatorium.txt b/...Bea/Psalterium/Psalmorum/Invitatorium.txt → ...ras/Latin-Bea/Psalterium/Invitatorium.txt