From c414214e50c32075fad1c5d987a04c4410170e8f 2016-04-28 19:58:33 From: Bradley M. Kuhn Date: 2016-04-28 19:58:33 Subject: [PATCH] Merge my offline changes with upstream pushes on k ssh://k.sfconservancy.org/website had incoming changes for me. --- diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index eb9c44a81dd591c5e94ea2f658f411f07b9b1831..f7d3883eccea7149eef7214a9a53817363c1ca5e 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -47,12 +47,12 @@ Conservancy needs {{ sitefundgoal.fundraiser_donation_count|intcomma }} Supporters to continue its basic community services & {{ sitefundgoal.fundraiser_goal_amount|intcomma }} to - avoid hibernating its enforcement efforts. + avoid hibernating its enforcement efforts in 2017. {% else %} Conservancy will continue our basic community services, thanks to our first {{ sitefundgoal.fundraiser_donation_count|intcomma }} Supporters! We still need {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }} more Supporters to avoid reducing licensing work & hibernating our - enforcement efforts. + enforcement efforts in 2017. {% endif %} {% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %} The next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters