Merge branch 'main' into release

Author: ewdurbin

sponsors/admin.py

@@ -258,7 +258,7 @@ class TargetableEmailBenefitsFilter(admin.SimpleListFilter):
     @cached_property
     def benefits(self):
         qs = EmailTargetableConfiguration.objects.all().values_list("benefit_id", flat=True)
-        benefits = SponsorshipBenefit.objects.filter(id__in=Subquery(qs))
+        benefits = SponsorshipBenefit.objects.filter(id__in=Subquery(qs), year=SponsorshipCurrentYear.get_year())
         return {str(b.id): b for b in benefits}
 
     def lookups(self, request, model_admin):

sponsors/forms.py

@@ -127,6 +127,7 @@ def get_package(self):
         if not pkg_benefits and standalone:  # standalone only
             pkg, _ = SponsorshipPackage.objects.get_or_create(
                 slug="standalone-only",
+                year=SponsorshipCurrentYear.get_year(),
                 defaults={"name": "Standalone Only", "sponsorship_amount": 0},
             )
 

templates/sponsors/admin/contract-template.docx

@@ -13,7 +13,7 @@
     <h1>Application submitted!</h1>
     <hr>
     <p><i>Thank you for submitting your application to sponsor the PSF ecosystem.</i></p>
-    <p>Our team has been notified and will contact you within 2 business days to discuss next steps.</p>
+    <p>Our team has been notified and will contact you within 5 business days to discuss next steps.</p>
     <p>A confirmation has been emailed to {% for item in notified %}{% if forloop.first %}{% else %}{% if forloop.last %} and {% else %}, {% endif %}{% endif %}{{item}}{% endfor %}. <i class="fa fa-question-circle" title="Note: we only email confirmations to addresses which python.org has previously contacted."></i></p>
     <p>If you have any questions please respond to the confirmation email or contact <a href="mailto:[email protected]">[email protected]</a></p>
     <p>- The Python Software Foundation Sponsorship Team</p>