-
Notifications
You must be signed in to change notification settings - Fork 60
fix(brazil): update Brazilian calendar definitions and add tests #993
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.
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
base: dev
Are you sure you want to change the base?
Conversation
|
@sljunior, could you also review this PR please? 🙏 |
|
Note that there are still some localisation bugs in Note on Bl Albertina Berkenbrock removal (in my branch): I have a feeling that she is celebrated at diocesan level, not at national level. Therefore, I have kept the localisation strings and her martyrology item, but I have removed her celebration from brazil/index.ts. |
|
I have added However, there are still other issues reported by ERR Useless martyrology items:
- albertina_berkenbrock_virgin
WARN Missing localized 'fr' items for the Proper of Time and the General Roman Calendar:
names:
- teresa_of_calcutta_virgin
WARN Missing localized 'it' items for the Proper of Time and the General Roman Calendar:
names:
- teresa_of_calcutta_virgin
WARN Missing localized 'pl' items for the Proper of Time and the General Roman Calendar:
names:
- teresa_of_calcutta_virgin@TobiTenno, we might need to remove And do you want me to add
|
@tukusejssirs given that martyrology is (after the reforms after VII) for all intents and purposes far more verbose than our calendars, leaving entries in the martyrology that may not be used on a calendar would be appropriate, since a local or even church-specific calendar may use them in the future and it would be better to have sources ready for where those declarations already exist. pursuant to that, where in the rules is it specified that entries in martyrology should only exist if they're in a calendar? |
Etienne indended However, I have always wanted to include all celebrations from Martyrologium Romanum (MarR) + all celebrations inscribed in the GRC and/or any particular calendar. The reason is that on any workday with fearia and optional memorials only, one can celebrate the persons from the MarR (which could be optionally output in generated calendars). Etienne did not want to make it part of romcal, but we could create a plugin with the celebrations from MarR. See also #310.
All I know of is that there is an NPM script called romcal/rites/roman1969/build/data-checks.ts Lines 257 to 261 in ac3f74a
But if you asked about written rules, I know of none, as most (if not all) written rules where created by me. |
TobiTenno
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems good overall to me.
i agree that martyrology would serve better as a full catalog of the full martyrology to be able to be pulled from whenever needed and not just what's in an individual calendar.
|
@emagnier would appreciate your thoughts on:
|
|
|
Thanks everyone for this contribution and for the review work on the Brazilian calendar! To clarify the topic regarding how to use the martyrology: So yes, we shouldn’t restrict ourselves here: any valid new martyrology entry is fine, even if it isn’t used by a calendar yet. It will still be useful later. Also, just a reminder: bundling tasks automatically match martyrology entries with each By the way @tukusejssirs, I’m also really happy to discover your project’s repo about OCR’ing the Latin translation of MarR. That’s an awesome initiative! |
|
Thanks, @emagnier, I’m really glad you changed your mind. 🙏
I have definitely mentioned somewhere in romcal back 2021. 🤷♂️ |
|
@tukusejssirs that's awesome! I've got a reprint of the 62 martyrology in English if you ever want to cross-reference something |
|
@emagnier, I have mentioned it in #208 → in the issue description. |
I definitely want to gather all editions of MarR, MR, celebration inscription/update decrees, esp those which relate to the 1969 revision of the GRC. I would be nice of you if you upload it to my gDrive (I believe I have added you and Etienne editor rights), add a text file with a source (mention yourself if you didn’t get it online) and adjust who can view it (make it public or share it with me and Etienne, based on what you want). I have already gathered these MarRs (apart from the Latin one): But see the description in #208 for more info. Let’s continue the discussion there. As for this PR, I presume it is on hold until we create another PR to update |
Ah, thanks for digging up that message from 5 years ago! 🙏 I must have missed that link among all the details you shared back then. |
Calendar changes: - Fix `peter_of_alcantara_priest` rank to `OptionalMemorial_12` - Move `faustina_kowalska_virgin` after `benedict_the_moor_religious` - Remove `john_de_brebeuf_isaac_jogues_priests_and_companions_martyrs` (celebrated alongside `peter_of_alcantara_priest` and `paul_of_the_cross_priest` as optional memorials) - Remove `albertina_berkenbrock_virgin` (not found in Brazilian Ordos or cnbb.org.br) - Add date exceptions for `assumption_of_the_blessed_virgin_mary` (transfer to 3rd Sunday of August) - Add date exceptions for `all_saints` (transfer to 1st Sunday of November) - Add source references to all celebrations Locale changes (`pt-br.ts`): - `andrew_de_soveral_and_ambrose_francis_ferro_priests` - `anthony_of_saint_anne_galvao_priest` - `assumption_of_the_blessed_virgin_mary` - `ephrem_the_syrian_deacon` - `ignatius_de_azevedo_priest_and_companions_martyrs` - `john_de_brebeuf_isaac_jogues_priests_and_companions_martyrs` - `our_lady_of_aparecida_patroness_of_brazil` - `our_lady_of_mount_carmel` - `paulina_of_the_agonizing_heart_of_jesus_visintainer_virgin` - `pontian_i_pope_and_hippolytus_of_rome_priest` - `roch_gonzalez_alphonsus_rodriguez_and_john_del_castillo_priests` Test changes: - Add tests for all Brazilian celebrations in chronological order - Fix `peter_of_alcantara_priest` test to expect `OptionalMemorial` - Fix typo in `benedict_the_moor_religious` test name
cdfa8e3 to
07383ed
Compare
|
@TobiTenno, why did you approve this PR? |
Portuguese OriginalRevisão do PR #993Olá @tukusejssirs! 👋 Revisei este PR e está muito bem estruturado. Aqui está minha análise: ✅ Pontos Positivos
✅ Compatibilidade com PR #1002Verifiquei a compatibilidade com o PR #1002 (484 traduções pt-br) e todas as traduções mencionadas neste PR já estão presentes no PR #1002:
Não há conflitos diretos entre os dois PRs. Se este PR for mesclado primeiro, o PR #1002 precisará de um rebase simples. 📝 Observações
✅ AprovaçãoEste PR está aprovado do ponto de vista das traduções e estrutura. As mudanças no calendário brasileiro estão corretas e bem documentadas. Bom trabalho! 🎉 PR #993 ReviewHello @tukusejssirs! 👋 I reviewed this PR and it's very well structured. Here's my analysis: ✅ Positive Points
✅ Compatibility with PR #1002I verified compatibility with PR #1002 (484 pt-br translations) and all translations mentioned in this PR are already present in PR #1002:
There are no direct conflicts between the two PRs. If this PR is merged first, PR #1002 will need a simple rebase. 📝 Notes
✅ ApprovalThis PR is approved from the translations and structure standpoint. The Brazilian calendar changes are correct and well documented. Great work! 🎉 |
|
Hi @tukusejssirs! 👋 I noticed that PR #1002 adds 484 missing pt-br translations. Since PR #993 is already approved and focused on Brazilian calendar improvements, would it make sense to include all these translations here as well? This would:
What PR #1002 adds:
Options:
What do you think? Would you prefer to include them here or keep them separate? 🤔 |
@sljunior, I personally don’t care, but the reviewer might, as it would add additional burden on them. I presume they want to keep it separate (your PR would add just the additional celebrations which are mostly not inscribed into any Portuguese/Brazilian calendar). But remember: I’d like to have source references in a comment on the same line as the value you add (most of the additions have no source reference). 🙏 @TobiTenno, WDYT? 🤔 |
|
i'd prefer keeping them separate, since #993 is already waiting on another upstream. there shouldn't be a problem in merging #1002 ahead of #993 if #1002 has all the requisite sources included. I'd prefer PRs remain as small as possible so we can review and merge easily, but obviously closely related changes should stay together (like i wouldn't chunk this PR into any smaller chunks, for example, likewise for #1002) |
Summary
Calendar changes:
peter_of_alcantara_priestrank toOptionalMemorial_12faustina_kowalska_virginafterbenedict_the_moor_religiousjohn_de_brebeuf_isaac_jogues_priests_and_companions_martyrs(celebrated alongside
peter_of_alcantara_priestandpaul_of_the_cross_priestas optional memorials)
albertina_berkenbrock_virgin(not found in Brazilian Ordosor cnbb.org.br)
assumption_of_the_blessed_virgin_mary(transfer to 3rd Sunday of August)
all_saints(transfer to 1st Sunday of November)Locale changes (
pt-br.ts):andrew_de_soveral_and_ambrose_francis_ferro_priestsanthony_of_saint_anne_galvao_priestassumption_of_the_blessed_virgin_maryephrem_the_syrian_deaconignatius_de_azevedo_priest_and_companions_martyrsjohn_de_brebeuf_isaac_jogues_priests_and_companions_martyrsour_lady_of_aparecida_patroness_of_brazilour_lady_of_mount_carmelpaulina_of_the_agonizing_heart_of_jesus_visintainer_virginpontian_i_pope_and_hippolytus_of_rome_priestroch_gonzalez_alphonsus_rodriguez_and_john_del_castillo_priestsTest changes:
peter_of_alcantara_priesttest to expectOptionalMemorialbenedict_the_moor_religioustest name