Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Rename Teams to projects #4156

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/migrate-tips.py
Original file line number Diff line number Diff line change
@@ -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())

Expand Down
18 changes: 9 additions & 9 deletions emails/charge_failed.spt
Original file line number Diff line number Diff line change
@@ -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'),
('<b><a href="{0}">{1}</a></b>'|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))) }}

<pre>{{ exchange.note }}</pre>

Expand All @@ -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 }}

Expand Down
18 changes: 9 additions & 9 deletions emails/charge_succeeded.spt
Original file line number Diff line number Diff line change
@@ -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'),
('<b><a href="{0}">{1}</a></b>'|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))) }}
<br>
<br>
<a href="{{ '{}receipts/{}.html'.format(participant.profile_url, exchange.id) }}"
Expand All @@ -17,10 +17,10 @@
[---] text/plain
{{ _("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'),
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)) }}

{{ _("Follow this link to view your receipt:") }} {{ '{}receipts/{}.html'.format(participant.profile_url, exchange.id) }}

Expand Down
18 changes: 18 additions & 0 deletions emails/project-approved.spt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{{ _("Application Approved!") }}
[---] text/html
{{ _( "We've approved your application for the '{project}' project on Gratipay. For details, please refer to {a}our review ticket{_a}."
, project=project.name
, a=('<a href="{}">'|safe).format(project.review_url)
, _a='</a>'|safe
) }}
<br>
<br>
{{ _("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! :-)") }}
13 changes: 13 additions & 0 deletions emails/project-rejected.spt
Original file line number Diff line number Diff line change
@@ -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=('<a href="{}">'|safe).format(project.review_url)
, _a='</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 }}
18 changes: 0 additions & 18 deletions emails/team-approved.spt

This file was deleted.

13 changes: 0 additions & 13 deletions emails/team-rejected.spt

This file was deleted.