Skip to content

Commit 27e52dc

Browse files
JohnRDOrazioJohnRDOrazio
authored
Merge pull request #299 from Liturgical-Calendar/development
prepare v4.5 release
2 parents b0ec00f + eb6ac1c commit 27e52dc

34 files changed

+497
-363
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ if we want to install system locales in order for `gettext` to work properly wit
9898

9999
# CHANGELOG
100100

101+
## [v4.5](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v4.5) (March 25th 2025)
102+
* restore wider region calendar `PUT`, `PATCH` and `DELETE` requests with full support for all i18n languages (issues #284, #265, and #220)
103+
Happy Feast of the Annunciation!
104+
101105
## [v4.4](https://github.com/JohnRDOrazio/LiturgicalCalendar/releases/tag/v4.4) (March 22nd 2025)
102106
* restore national calendar `PUT`, `PATCH` and `DELETE` requests with full support for all i18n languages (issues #284, #265, and #220)
103107

‎composer.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jsondata/schemas/DiocesanCalendar.json‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,10 @@
1212
"title": "Settings"
1313
},
1414
"metadata": {
15-
"type": "object",
16-
"additionalProperties": false,
17-
"properties": {
18-
"diocese_id": {
19-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/DiocesanCalendarId"
20-
},
21-
"diocese_name": {
22-
"type": "string",
23-
"pattern": "^[a-zA-Z0-9 ()'-]+$"
24-
},
25-
"nation": {
26-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Nation"
27-
},
28-
"locales": {
29-
"type": "array",
30-
"uniqueItems": true,
31-
"items": {
32-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
33-
}
34-
},
35-
"timezone": {
36-
"type": "string"
37-
},
38-
"group": {
39-
"type": "string"
40-
}
41-
},
42-
"required": [
43-
"diocese_id",
44-
"diocese_name",
45-
"nation",
46-
"locales",
47-
"timezone"
48-
]
15+
"$ref": "#/definitions/DiocesanCalendarMetadata"
4916
},
5017
"i18n": {
51-
"type": "object",
52-
"description": "A JSON object of the form { \"locale\": { \"key\": \"value\" } }, used only in PUT and PATCH requests.",
53-
"additionalProperties": false,
54-
"propertyNames": {
55-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
56-
},
57-
"patternProperties": {
58-
"": {
59-
"type": "object",
60-
"additionalProperties": false,
61-
"propertyNames": {
62-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/EventKey"
63-
},
64-
"patternProperties": {
65-
"": {
66-
"type": "string"
67-
}
68-
}
69-
}
70-
}
18+
"$ref": "#/definitions/CalendarI18n"
7119
}
7220
},
7321
"required": [
@@ -153,6 +101,64 @@
153101
]
154102
},
155103
"title": "LitCal"
104+
},
105+
"DiocesanCalendarMetadata": {
106+
"type": "object",
107+
"additionalProperties": false,
108+
"properties": {
109+
"diocese_id": {
110+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/DiocesanCalendarId"
111+
},
112+
"diocese_name": {
113+
"type": "string",
114+
"pattern": "^[a-zA-Z0-9 ()'-]+$"
115+
},
116+
"nation": {
117+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Nation"
118+
},
119+
"locales": {
120+
"type": "array",
121+
"uniqueItems": true,
122+
"items": {
123+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
124+
}
125+
},
126+
"timezone": {
127+
"type": "string"
128+
},
129+
"group": {
130+
"type": "string"
131+
}
132+
},
133+
"required": [
134+
"diocese_id",
135+
"diocese_name",
136+
"nation",
137+
"locales",
138+
"timezone"
139+
]
140+
},
141+
"CalendarI18n": {
142+
"type": "object",
143+
"description": "A JSON object of the form { \"locale\": { \"key\": \"value\" } }, used only in PUT and PATCH requests.",
144+
"additionalProperties": false,
145+
"propertyNames": {
146+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
147+
},
148+
"patternProperties": {
149+
"": {
150+
"type": "object",
151+
"additionalProperties": false,
152+
"propertyNames": {
153+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/EventKey"
154+
},
155+
"patternProperties": {
156+
"": {
157+
"type": "string"
158+
}
159+
}
160+
}
161+
}
156162
}
157163
}
158164
}

‎jsondata/schemas/NationalCalendar.json‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,7 @@
3636
"$ref": "#/definitions/NationalCalendarMetadata"
3737
},
3838
"i18n": {
39-
"type": "object",
40-
"description": "A JSON object of the form { \"locale\": { \"key\": \"value\" } }, used only in PUT and PATCH requests.",
41-
"additionalProperties": false,
42-
"propertyNames": {
43-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
44-
},
45-
"patternProperties": {
46-
"": {
47-
"type": "object",
48-
"additionalProperties": false,
49-
"propertyNames": {
50-
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/EventKey"
51-
},
52-
"patternProperties": {
53-
"": {
54-
"type": "string"
55-
}
56-
}
57-
}
58-
}
39+
"$ref": "#/definitions/NationalCalendarI18n"
5940
}
6041
},
6142
"required": [
@@ -453,6 +434,28 @@
453434
"Settings": {
454435
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/CalendarSettings",
455436
"title": "Settings"
437+
},
438+
"NationalCalendarI18n": {
439+
"type": "object",
440+
"description": "A JSON object of the form { \"locale\": { \"key\": \"value\" } }, used only in PUT and PATCH requests.",
441+
"additionalProperties": false,
442+
"propertyNames": {
443+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
444+
},
445+
"patternProperties": {
446+
"": {
447+
"type": "object",
448+
"additionalProperties": false,
449+
"propertyNames": {
450+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/EventKey"
451+
},
452+
"patternProperties": {
453+
"": {
454+
"type": "string"
455+
}
456+
}
457+
}
458+
}
456459
}
457460
}
458461
}

‎jsondata/schemas/WiderRegionCalendar.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
},
1717
"metadata": {
1818
"$ref": "#/definitions/CalendarMetadata"
19+
},
20+
"i18n": {
21+
"$ref": "#/definitions/CalendarI18n"
1922
}
2023
},
2124
"required": [
@@ -474,6 +477,28 @@
474477
"makePatron"
475478
],
476479
"title": "WiderRegionCalendarAction"
480+
},
481+
"CalendarI18n": {
482+
"type": "object",
483+
"description": "A JSON object of the form { \"locale\": { \"key\": \"value\" } }, used only in PUT and PATCH requests.",
484+
"additionalProperties": false,
485+
"propertyNames": {
486+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/Locale"
487+
},
488+
"patternProperties": {
489+
"": {
490+
"type": "object",
491+
"additionalProperties": false,
492+
"propertyNames": {
493+
"$ref": "https://litcal.johnromanodorazio.com/api/dev/jsondata/schemas/CommonDef.json#/definitions/EventKey"
494+
},
495+
"patternProperties": {
496+
"": {
497+
"type": "string"
498+
}
499+
}
500+
}
501+
}
477502
}
478503
}
479504
}

0 commit comments

Comments
 (0)