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.

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

lib/calendarium-romanum/temporale.rb (CalendariumRomanum::Temporale#holy_family): Changed to handle case when "a Sunday does not occur between December 25 and January 1" #1

Merged
merged 4 commits into from
Jan 9, 2017

Conversation

eddymul
Copy link
Contributor

@eddymul eddymul commented Jan 5, 2017

lib/calendarium-romanum/temporale.rb (CalendariumRomanum::Temporale#holy_family): Changed to handle case when "a Sunday does not occur between December 25 and January 1"

  • lib/calendarium-romanum/temporale.rb (CalendariumRomanum::Temporale#holy_family):
  • spec/temporale_spec.rb:
    Changed to handle case when "a Sunday does not occur between December 25 and January 1".

…oly_family): Changed to handle case when "a Sunday does not occur between December 25 and January 1"

* lib/calendarium-romanum/temporale.rb (CalendariumRomanum::Temporale#holy_family):
* spec/temporale_spec.rb:
Changed to handle case when "a Sunday does not occur between December 25 and January 1".
Copy link
Owner

@igneus igneus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! I have only two small objections. Once these issues are fixed, I'm going to merge it.

year ||= @year
xmas = nativity(year)
if xmas.sunday?
return Date.new(year, 12, 30) # and only 1 reading before Gospel
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the comment - lectionary is (and will always be) out of scope of this gem, so it's of no use here.

@@ -221,6 +221,12 @@
expect(c.rank).to eq CR::Ranks::FEAST_LORD_GENERAL
expect(c.title).to eq 'The Holy Family of Jesus, Mary and Joseph'
expect(c.colour).to eq CR::Colours::WHITE

@t17 = described_class.new 2016
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make it a separate test case (it).

…ly Family Friday.

* lib/calendarium-romanum/temporale.rb (CalendariumRomanum::Temporale#holy_family): No op. Removed comment about lectionary.
Changed to:
- add link to English translation of Mysterii Paschalis
- remove link to AAS.
Changed to fix broken link to English translation of Mysterii Paschalis. Was missing trailing 'L' in 'HTML'.
@igneus igneus merged commit 4ba79b6 into igneus:master Jan 9, 2017
@igneus
Copy link
Owner

igneus commented Jan 9, 2017

Once again - thanks a lot!

@igneus
Copy link
Owner

igneus commented Feb 26, 2017

@eddymul Just to let you know - this fix is finally deployed at http://calapi.inadiutorium.cz, too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants