Merge branch 'main' into fix-916

.gitignore

@@ -13,8 +13,8 @@ __pycache__
 /src
 /include
 .coverage
-.venv/
-venv/
+.venv
+venv
 static/media
 .idea/*
 .vscode

organize/urls.py

@@ -11,4 +11,5 @@
     path("form/<slug:step>/", views.organize_form_wizard, name="form_step"),
     # path('remote_or_in_person/', views.remote_or_in_person, name='remote_or_in_person'),
     path("suspend/", views.suspend, name="suspend"),
+    path("event_funding/", views.event_funding, name="event_funding"),
 ]

organize/views.py

@@ -104,3 +104,7 @@ def prerequisites(request):
 
 def suspend(request):
     return render(request, "organize/suspend.html", {})
+
+
+def event_funding(request):
+    return render(request, "organize/event_funding.html", {})

requirements.txt

@@ -183,11 +183,11 @@ pluggy==1.0.0
     # via pytest
 pre-commit==2.21.0
     # via -r requirements.in
-protobuf==4.22.0
+protobuf==4.24.4
     # via
     #   google-api-core
     #   googleapis-common-protos
-psycopg2-binary==2.8.3
+psycopg2-binary==2.9.9
     # via -r requirements.in
 py==1.11.0
     # via pytest

templates/organize/event_funding.html

@@ -0,0 +1,58 @@
+{% extends "global/base.html" %}
+{% load i18n rev static %}
+
+{% block content %}
+<div class="container">
+    <h2>{% trans "Apply for Sponsorship from our Global Partners" %}</h2>
+
+    <p>{% blocktrans trimmed %}
+        Some of our global partners also fund Django Girls workshops. However, they prefer that Django Girls Foundation handle
+        the sponsorship application process and they only handle sending the money to the workshop organizers. Django Girls has
+        done this in the past with GitHub sponsorships though that is no longer available.
+        {% endblocktrans %}
+    </p>
+
+    <p>{% blocktrans trimmed %}
+        Starting November 2023, Django Girls will be handling sponsorship applications for workshops. The organisations Django 
+        Girls are handling the sponsorship process are listed below with the terms and conditions of the sponsorship.
+        {% endblocktrans %}
+    </p>
+
+    <div>
+        <h3><a href="https://www.djangoproject.com" target="_blank">Django Software Foundation</a></h3>
+        <p>{% blocktrans trimmed %}
+            Starting November 2023, sponsorship applications to the DSF will be handled by Django Girls Foundation. The terms
+            and conditions of this sponsorship as laid out by the DSF are as follows:
+            {% endblocktrans %}
+            <ul>
+                <li>
+                    {% blocktrans trimmed %}
+                    The DSF has set aside a limited budget for Django Girls workshops sponsorship spread out through the year. 
+                    For this reason, they will only sponsorship only one event per city per year.
+                    {% endblocktrans %}
+                </li>
+                <li>
+                    {% blocktrans trimmed %}
+                    The typical DSF sponsorship will be $300 per event, or $500 when the assumption is that the group has large needs 
+                    and difficulty fundraising or events outside of the US or Western Europe.
+                    {% endblocktrans %}
+                </li>
+                <li>{% blocktrans trimmed %}
+                    The DSF funds events, not long term boot camps therefore this application form should only be used for Django Girls 
+                    workshop applications only.
+                    {% endblocktrans %}
+                </li>
+                <li>{% trans "The DSF's support has to be publicly recognised and acknowledged." %}</li>
+                <li>{% blocktrans trimmed %}The DSF has to receive a report of the event via their email <a href="mailto:dsfboard@googlegroups.com">dsfboard@googlegroups.com</a>
+                    which should be copied to <a href="mailto:hello@djangogirls.org">hello@djangogirls.org</a>.
+                    {% endblocktrans %}
+                </li>
+            </ul>
+        </p>
+
+        <p>{% trans "To apply for DSF funding, please fill in 
+            <a href="https://docs.google.com/forms/d/1KBQKnwY0uFBB0R7HOJIA3VAr9PsUywnp-9yX9El9-Wk/viewform">this form</a>." %}
+        </p>
+    </div>
+</div>
+{% endblock %}

templates/organize/index.html

@@ -104,6 +104,9 @@ <h2>{% trans "Resources for organizers" %}</h2>
                         <li>
                             <a href="https://tutorial.djangogirls.org/">{% trans "Django Girls Workshop Tutorial" %}</a>
                         </li>
+                        <li>
+                            <a href="{% url 'organize:event_funding' %}">{% trans "Apply for Event Sponsorship" %}</a>
+                        </li>
                         <li>
                             <span>{% blocktrans %}Private mailing list &amp; Slack{% endblocktrans %}</span>
                         </li>

tests/organize/test_views.py

@@ -1,6 +1,7 @@
 import pytest
 from django.template.loader import render_to_string
 from django.urls import reverse
+from pytest_django.asserts import assertTemplateUsed
 
 
 def test_form_thank_you(client):
@@ -106,3 +107,9 @@ def test_organize_form_wizard_workshops_too_close(client, previous_organizer_in_
                 response["form.errors"] == "Your workshops should be at least 6 months apart. "
                 "Please read our Organizer Manual."
             )
+
+
+def test_event_funding(client):
+    response = client.get(reverse("organize:event_funding"))
+    assert response.status_code == 200
+    assertTemplateUsed(response, "organize/event_funding.html")