search

igneus / calendarium-romanum

liturgical calendar library (Roman Catholic, post-Vatican II)
50 stars 21 forks source link

Fixed query output for a season #9

Closed simonszu closed 6 years ago

simonszu commented 6 years ago

I have fixed the query output for a season. To achieve this, i simply have defined another attribute, @name for a season object which contains the name of the season in human readable format (speak: a string). So, calendariumrom query just has to output day.season.name instead of day.season and we're good to go.

simonszu commented 6 years ago

Yes, my fault. I didn't think of internationalization. I have reverted this change in the Season class, and have also written a test for calendariumrom query

igneus commented 6 years ago

Now the code is all right, but commit history is messy. I will ask you to rebase on current master.

I understood you haven't done this before, so here is how to do it:

# 0. make a "copy" of the branch for the case that everything gets screwed
git checkout fix-season-display # go to the branch
git checkout -b fix-season-display-my-safety-copy # "copy" it

# 1. update local master
git checkout master
git pull --ff-only igneus master # replace "igneus" by the name you gave the upstream repository in your local repo

# 2. rebase on the current master
git checkout fix-season-display
git rebase -i master # While rebasing, please squash the commits to one

# 3. force-push to github
git push -f origin fix-season-display # replace "origin" by the name you gave your github fork of calendarium-romanum in your local repo
simonszu commented 6 years ago

OK, i understand that a cleaned commit history is prettier. I will look deeper into the rebase command to fully understand what i just did. Thank you for your patience.

igneus commented 6 years ago

Thank you very much. Merging.