Skip to content

Commit 6adbb8a

Browse files
committed
fix action MoveLiturgicalEvent -> MoveEvent
1 parent a37339a commit 6adbb8a

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

jsondata/schemas/CommonDef.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
"createNew",
337337
"setProperty",
338338
"makePatron",
339-
"moveLiturgicalEvent"
339+
"moveEvent"
340340
],
341341
"title": "NationalCalendarAction"
342342
},

jsondata/sourcedata/calendars/nations/US/US.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"month": 1
1818
},
1919
"metadata": {
20-
"action": "moveLiturgicalEvent",
20+
"action": "moveEvent",
2121
"missal": "US_2011",
2222
"reason": "National Day of Prayer for the Unborn",
2323
"since_year": 1970
@@ -30,7 +30,7 @@
3030
"month": 10
3131
},
3232
"metadata": {
33-
"action": "moveLiturgicalEvent",
33+
"action": "moveEvent",
3434
"missal": "US_2011",
3535
"reason": "Saint John Brebeuf (elevated to memorial)",
3636
"since_year": 1970
@@ -69,7 +69,7 @@
6969
"month": 7
7070
},
7171
"metadata": {
72-
"action": "moveLiturgicalEvent",
72+
"action": "moveEvent",
7373
"missal": "US_2011",
7474
"reason": "Blessed Kateri Tekakwitha",
7575
"since_year": 1970
@@ -82,7 +82,7 @@
8282
"month": 7
8383
},
8484
"metadata": {
85-
"action": "moveLiturgicalEvent",
85+
"action": "moveEvent",
8686
"missal": "US_2011",
8787
"reason": "Independence Day",
8888
"since_year": 1970

src/Paths/Calendar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2882,6 +2882,7 @@ private function checkCoincidencesNewMobileLiturgicalEvent(object $row): bool
28822882
* 8. Source of the information
28832883
*/
28842884
_('In the year %1$d, the %2$s \'%3$s\' has been suppressed by the %4$s \'%5$s\', added on %6$s since the year %7$d (%8$s).'),
2885+
$this->CalendarParams->Year,
28852886
$this->LitGrade->i18n($coincidingLiturgicalEvent->grade, false),
28862887
'<i>' . $coincidingLiturgicalEvent->name . '</i>',
28872888
$this->LitGrade->i18n($row->liturgical_event->grade, false),

0 commit comments

Comments
 (0)