From b1572f9232ee62d489126555bfe9a51313347767 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Sat, 22 Oct 2016 17:50:15 -0400 Subject: [PATCH 1/2] Start renaming Teams to projects --- bin/migrate-tips.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/migrate-tips.py b/bin/migrate-tips.py index ff73544228..6fccd2405f 100644 --- a/bin/migrate-tips.py +++ b/bin/migrate-tips.py @@ -1,5 +1,5 @@ from gratipay.wireup import db, env -from gratipay.models.team.mixins.tip_migration import migrate_all_tips +from gratipay.models.projects.mixins.tip_migration import migrate_all_tips db = db(env()) From 89d04571dc4c63c877cf347807cf8c353c85ceb2 Mon Sep 17 00:00:00 2001 From: Chad Whitacre Date: Sat, 22 Oct 2016 17:54:43 -0400 Subject: [PATCH 2/2] ./emails/ --- emails/charge_failed.spt | 18 +++++++++--------- emails/charge_succeeded.spt | 18 +++++++++--------- emails/project-approved.spt | 18 ++++++++++++++++++ emails/project-rejected.spt | 13 +++++++++++++ emails/team-approved.spt | 18 ------------------ emails/team-rejected.spt | 13 ------------- 6 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 emails/project-approved.spt create mode 100644 emails/project-rejected.spt delete mode 100644 emails/team-approved.spt delete mode 100644 emails/team-rejected.spt diff --git a/emails/charge_failed.spt b/emails/charge_failed.spt index a3f856bf0c..c4b0009a52 100644 --- a/emails/charge_failed.spt +++ b/emails/charge_failed.spt @@ -1,14 +1,14 @@ -{{ _("Oh no! A problem supporting {0}!", top_team) }} +{{ _("Oh no! A problem supporting {0}!", top_project) }} [---] text/html {{ _("We tried to charge your credit card {0} today, to fund your ongoing support for {1}, but the charge failed with this message:", format_currency(exchange.amount + exchange.fee, 'USD'), ('{1}'|safe).format( participant.profile_url+'giving/', - top_team if nteams == 1 else ngettext('{0} and {n} other', - '{0} and {n} others', - nteams - 1, - top_team))) }} + top_project if nprojects == 1 else ngettext('{0} and {n} other', + '{0} and {n} others', + nprojects - 1, + top_project))) }} 
{{ exchange.note }}
@@ -18,10 +18,10 @@ [---] text/plain {{ _("We tried to charge your credit card {0} today, to fund your ongoing support for {1}, but the charge failed with this message:", format_currency(exchange.amount + exchange.fee, 'USD'), - top_team if nteams == 1 else ngettext('{0} and {n} other', - '{0} and {n} others', - nteams - 1, - top_team)) }} + top_project if nprojects == 1 else ngettext('{0} and {n} other', + '{0} and {n} others', + nprojects - 1, + top_project)) }} {{ exchange.note }} diff --git a/emails/charge_succeeded.spt b/emails/charge_succeeded.spt index ee245565a9..9318b7dced 100644 --- a/emails/charge_succeeded.spt +++ b/emails/charge_succeeded.spt @@ -1,14 +1,14 @@ -{{ _("Thanks for supporting {0}!", top_team) }} +{{ _("Thanks for supporting {0}!", top_project) }} [---] text/html {{ _("We charged your credit card {0} today, to fund your ongoing support for {1}. Thanks for using Gratipay!", format_currency(exchange.amount + exchange.fee, 'USD'), ('{1}'|safe).format( participant.profile_url+'giving/', - top_team if nteams == 1 else ngettext('{0} and {n} other', - '{0} and {n} others', - nteams - 1, - top_team))) }} + top_project if nprojects == 1 else ngettext('{0} and {n} other', + '{0} and {n} others', + nprojects - 1, + top_project))) }}

'|safe).format(project.review_url) + , _a=''|safe + ) }} +
+
+{{ _("Thanks for using Gratipay! :-)") }} +[---] text/plain +{{ _( "We've approved your application for the '{project}' project on Gratipay. For details, please refer to our review ticket:" + , project=project.name + ) }} + +{{ project.review_url }} + +{{ _("Thanks for using Gratipay! :-)") }} diff --git a/emails/project-rejected.spt b/emails/project-rejected.spt new file mode 100644 index 0000000000..b38929b7df --- /dev/null +++ b/emails/project-rejected.spt @@ -0,0 +1,13 @@ +{{ _("Application Rejected") }} +[---] text/html +{{ _( "We've rejected your application for the '{project}' project on Gratipay. For details, please refer to {a}our review ticket{_a}." + , project=project.name + , a=(''|safe).format(project.review_url) + , _a=''|safe + ) }} +[---] text/plain +{{ _( "We've rejected your application for the '{project}' project on Gratipay. For details, please refer to our review ticket:" + , project=project.name + ) }} + +{{ project.review_url }} diff --git a/emails/team-approved.spt b/emails/team-approved.spt deleted file mode 100644 index 8f6dab84ab..0000000000 --- a/emails/team-approved.spt +++ /dev/null @@ -1,18 +0,0 @@ -{{ _("Team Application Approved!") }} -[---] text/html -{{ _( "We've approved your application for the '{team}' Team on Gratipay. For details, please refer to {a}our review ticket{_a}." - , team=team.name - , a=(''|safe).format(team.review_url) - , _a=''|safe - ) }} -
-
-{{ _("Thanks for using Gratipay! :-)") }} -[---] text/plain -{{ _( "We've approved your application for the '{team}' Team on Gratipay. For details, please refer to our review ticket:" - , team=team.name - ) }} - -{{ team.review_url }} - -{{ _("Thanks for using Gratipay! :-)") }} diff --git a/emails/team-rejected.spt b/emails/team-rejected.spt deleted file mode 100644 index f0b0d7b7aa..0000000000 --- a/emails/team-rejected.spt +++ /dev/null @@ -1,13 +0,0 @@ -{{ _("Team Application Rejected") }} -[---] text/html -{{ _( "We've rejected your application for the '{team}' Team on Gratipay. For details, please refer to {a}our review ticket{_a}." - , team=team.name - , a=(''|safe).format(team.review_url) - , _a=''|safe - ) }} -[---] text/plain -{{ _( "We've rejected your application for the '{team}' Team on Gratipay. For details, please refer to our review ticket:" - , team=team.name - ) }} - -{{ team.review_url }}