From fbed27d866e6c01cdd7fc38cf90e19e745ef1d5a Mon Sep 17 00:00:00 2001
From: Mark Walker <mark@marksweb.co.uk>
Date: Sun, 27 Oct 2024 23:58:44 +0000
Subject: [PATCH] fix: Addressing review comments

---
 .../includes/display_django_heroes.html        | 18 ++++++++++++------
 .../fundraising/manage-donations.html          |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/djangoproject/templates/fundraising/includes/display_django_heroes.html b/djangoproject/templates/fundraising/includes/display_django_heroes.html
index 647cf5afb..c321b521e 100644
--- a/djangoproject/templates/fundraising/includes/display_django_heroes.html
+++ b/djangoproject/templates/fundraising/includes/display_django_heroes.html
@@ -1,7 +1,8 @@
 {% load humanize i18n %}
 <div class="heroes">
   {% if corporate_members.diamond %}
-    <h3>{% translate "Diamond Corporate Members" %} (${{ corporate_membership_amounts.diamond|intcomma }}+)</h3>
+    <h3>{% blocktranslate trimmed with amount=corporate_membership_amounts.diamond|intcomma %}
+      Diamond Corporate Members (${{ amount }}+){% endblocktranslate %}</h3>
     <div>
       {% for obj in corporate_members.diamond %}
         {% include "fundraising/includes/_hero_with_logo.html" %}
@@ -10,7 +11,8 @@ <h3>{% translate "Diamond Corporate Members" %} (${{ corporate_membership_amount
   {% endif %}
 
   {% if corporate_members.platinum %}
-    <h3>{% translate "Platinum Corporate Members" %} (${{ corporate_membership_amounts.platinum|intcomma }}+)</h3>
+    <h3>{% blocktranslate trimmed with amount=corporate_membership_amounts.platinum|intcomma %}
+      Platinum Corporate Members (${{ amount }}+){% endblocktranslate %}</h3>
     <div>
       {% for obj in corporate_members.platinum %}
         {% include "fundraising/includes/_hero_with_logo.html" %}
@@ -19,7 +21,8 @@ <h3>{% translate "Platinum Corporate Members" %} (${{ corporate_membership_amoun
   {% endif %}
 
   {% if corporate_members.gold %}
-    <h3>{% translate "Gold Corporate Members" %} (${{ corporate_membership_amounts.gold|intcomma }}+)</h3>
+    <h3>{% blocktranslate trimmed with amount=corporate_membership_amounts.gold|intcomma %}
+      Gold Corporate Members (${{ amount }}+){% endblocktranslate %}</h3>
     <div>
       {% for obj in corporate_members.gold %}
         {% include "fundraising/includes/_hero_with_logo.html" %}
@@ -28,7 +31,8 @@ <h3>{% translate "Gold Corporate Members" %} (${{ corporate_membership_amounts.g
   {% endif %}
 
   {% if corporate_members.silver %}
-    <h3>{% translate "Silver Corporate Members" %} (${{ corporate_membership_amounts.silver|intcomma }}+)</h3>
+    <h3>{% blocktranslate trimmed with amount=corporate_membership_amounts.silver|intcomma %}
+      Silver Corporate Members (${{ amount }}+){% endblocktranslate %}</h3>
     <div>
       {% for obj in corporate_members.silver %}
         {% include "fundraising/includes/_hero_with_logo.html" %}
@@ -37,7 +41,8 @@ <h3>{% translate "Silver Corporate Members" %} (${{ corporate_membership_amounts
   {% endif %}
 
   {% if corporate_members.bronze %}
-    <h3>{% translate "Bronze Corporate Members" %} (${{ corporate_membership_amounts.bronze|intcomma }}+)</h3>
+    <h3>{% blocktranslate trimmed with amount=corporate_membership_amounts.bronze|intcomma %}
+      Bronze Corporate Members (${{ amount }}+){% endblocktranslate %}</h3>
     <div>
       {% for obj in corporate_members.bronze %}
         {% include "fundraising/includes/_hero_with_logo.html" %}
@@ -55,7 +60,8 @@ <h3><a id="in-kind-donors" href="#in-kind-donors">{% translate "In-kind donors"
     {% endwith %}
   </div>
 
-  <h3>{% translate "Leaders" %} (${{ display_logo_amount|intcomma }}+)</h3>
+  <h3>{% blocktranslate trimmed with amount=display_logo_amount|intcomma %}
+    Leaders (${{ amount }}+){% endblocktranslate %}</h3>
   <p>
     {% blocktranslate trimmed with amount=display_logo_amount|intcomma %}
       Leadership-level donors contribute ${{ amount }} or
diff --git a/djangoproject/templates/fundraising/manage-donations.html b/djangoproject/templates/fundraising/manage-donations.html
index 3b4eda7c2..340bc6550 100644
--- a/djangoproject/templates/fundraising/manage-donations.html
+++ b/djangoproject/templates/fundraising/manage-donations.html
@@ -31,7 +31,7 @@ <h2>{% translate "Manage your participation in the fundraising campaigns" %}</h2
     {% csrf_token %}
     {% include 'fundraising/includes/_form.html' with form=hero_form %}
     <p class="submit">
-      <input type="submit" class="cta" value="{% translate "Save &rarr;" %}">
+      <input type="submit" class="cta" value="{% translate "Save &rarr;" context "Save personal details about donation" %}">
     </p>
   {# Always include to avoid "Management form has been tampered with" if no recurring donations exist #}
     {{ modify_donations_formset.management_form }}
@@ -48,7 +48,7 @@ <h2>{% translate "Modify your recurring donations" %}</h2>
         </div>
       {% endfor %}
       <p class="submit">
-        <input type="submit" class="cta" value="{% translate "Save &rarr;" %}">
+        <input type="submit" class="cta" value="{% translate "Save &rarr;" context "Save personal details about donation" %}">
       </p>
       </form>
       <hr />