-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Update Leaders donation limit text #2191
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: main
Are you sure you want to change the base?
Conversation
8c8751b
to
2b3f790
Compare
for more information, see https://pre-commit.ci
I tried squashing my commits. I'm not familiar enough with git to understand how to get my two commits down to one. Anyone that can help? |
Leadership-level donors contribute ${{ amount }} or | ||
more in a calendar year. | ||
Leadership-level donors contribute at least ${{ amount }} | ||
and have donated in the last {{ display_donor_days }} days. |
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.
I am not sure if we want to have this displaying in the last 365 days
. I think I'll prefer to say in the last calendar year
instead.
and have donated in the last {{ display_donor_days }} days. | |
and have donated in the last calendar year. |
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.
@thibaudcolas What do you think about this? Is the intention here to say 365 days explicitly?
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.
I rechecked this, and the way we calculate this is indeed for the last 365 days. So, this change looks good to me.
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.
LGTM 🌮
Great work @house-ben 🎉 Congrats on your first contribution!
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.
@house-ben thanks for the PR! The code change makes sense to me. I will let the stakeholders give the final approval for the language change and to check if this PR fulfills the requirements.
Fixed the contribution description for #1766
Since the heroes are based on the total donated_amount contributed, not the donations over the past year, the text has to be updated.
djangoproject.com/fundraising/templatetags/fundraising_extras.py
Lines 95 to 113 in 100d673
The fundraisers also have to have donated in the past year to show up
djangoproject.com/fundraising/models.py
Lines 25 to 35 in 5537f96