From dd2ee7b558bef9b63870485f169aec35ccbdbecd Mon Sep 17 00:00:00 2001 From: badbl0cks <4161747+badbl0cks@users.noreply.github.com> Date: Tue, 8 Apr 2025 01:23:52 -0700 Subject: [PATCH] update email templates to link to trade offer itself and unify language --- theme/templates/email/common/footer.txt | 4 +--- theme/templates/email/common/header.txt | 2 +- theme/templates/email/trades/trade_update_accepted.txt | 6 +++--- theme/templates/email/trades/trade_update_received.txt | 6 +++--- .../email/trades/trade_update_rejected_by_acceptor.txt | 4 ++-- .../email/trades/trade_update_rejected_by_initiator.txt | 5 ++++- theme/templates/email/trades/trade_update_sent.txt | 6 +++--- .../email/trades/trade_update_thanked_by_acceptor.txt | 6 +++--- .../templates/email/trades/trade_update_thanked_by_both.txt | 5 ++++- .../email/trades/trade_update_thanked_by_initiator.txt | 6 +++--- 10 files changed, 27 insertions(+), 23 deletions(-) diff --git a/theme/templates/email/common/footer.txt b/theme/templates/email/common/footer.txt index 092e55d..6326c3d 100644 --- a/theme/templates/email/common/footer.txt +++ b/theme/templates/email/common/footer.txt @@ -1,3 +1 @@ -Thank you for using PᴋMɴ Trade Club. - -Happy trading! \ No newline at end of file +Thank you for using PᴋMɴ Trade Club. Happy trading! \ No newline at end of file diff --git a/theme/templates/email/common/header.txt b/theme/templates/email/common/header.txt index 4de79b2..ffcfc5f 100644 --- a/theme/templates/email/common/header.txt +++ b/theme/templates/email/common/header.txt @@ -1 +1 @@ -Hello {{ recipient_user }}, \ No newline at end of file +Howdy {{ recipient_user }}! \ No newline at end of file diff --git a/theme/templates/email/trades/trade_update_accepted.txt b/theme/templates/email/trades/trade_update_accepted.txt index 7947a62..9ca99f2 100644 --- a/theme/templates/email/trades/trade_update_accepted.txt +++ b/theme/templates/email/trades/trade_update_accepted.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -Great news! {{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has accepted your trade offer. +Great news! {{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has accepted your trade offer. Trade Details: - They have: {{ want_card }} @@ -8,8 +8,8 @@ Trade Details: What's next? You can now mark the trade as "Sent" once you've offered the card to them in the app, or reject the trade if needed. -Visit your dashboard to manage this trade: -{{ domain }}{% url 'dashboard' %} +Visit the trade update page to mark it "Sent": +{{ domain }}{% url 'trade_acceptance_update' pk %} {% include 'email/common/footer.txt' %} diff --git a/theme/templates/email/trades/trade_update_received.txt b/theme/templates/email/trades/trade_update_received.txt index 975e4bf..0890169 100644 --- a/theme/templates/email/trades/trade_update_received.txt +++ b/theme/templates/email/trades/trade_update_received.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -Great news! {{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has marked your trade as "Received". +Great news! {{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has marked your trade as "Received". Trade Details: - They sent: {{ want_card }} @@ -8,8 +8,8 @@ Trade Details: What's next? Send a thank you to this user to increase their reputation! -Visit your dashboard to send thanks: -{{ domain }}{% url 'dashboard' %} +Visit the trade update page to send thanks: +{{ domain }}{% url 'trade_acceptance_update' pk %} {% include 'email/common/footer.txt' %} diff --git a/theme/templates/email/trades/trade_update_rejected_by_acceptor.txt b/theme/templates/email/trades/trade_update_rejected_by_acceptor.txt index 160e442..42a2d07 100644 --- a/theme/templates/email/trades/trade_update_rejected_by_acceptor.txt +++ b/theme/templates/email/trades/trade_update_rejected_by_acceptor.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -We're sorry to inform you that {{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has canceled their trade acceptance. +We're sorry to inform you that {{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has canceled their trade acceptance. Trade Details: - They had: {{ want_card }} @@ -8,7 +8,7 @@ Trade Details: Your trade offer is still active and available for other users to accept. -Visit your dashboard to manage your trade offers: +Visit your dashboard: {{ domain }}{% url 'dashboard' %} {% include 'email/common/footer.txt' %} diff --git a/theme/templates/email/trades/trade_update_rejected_by_initiator.txt b/theme/templates/email/trades/trade_update_rejected_by_initiator.txt index 46f5903..4919fdb 100644 --- a/theme/templates/email/trades/trade_update_rejected_by_initiator.txt +++ b/theme/templates/email/trades/trade_update_rejected_by_initiator.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -We're sorry to inform you that {{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has rejected the trade. +We're sorry to inform you that {{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has rejected the trade. Trade Details: - You had: {{ has_card }} @@ -11,6 +11,9 @@ Don't worry - there are plenty of other trade opportunities available! You can b Visit the marketplace: {{ domain }}{% url 'trade_offer_list' %} +Visit your dashboard: +{{ domain }}{% url 'dashboard' %} + {% include 'email/common/footer.txt' %} Trade ID: #{{ hash }} \ No newline at end of file diff --git a/theme/templates/email/trades/trade_update_sent.txt b/theme/templates/email/trades/trade_update_sent.txt index e8c1625..fa216db 100644 --- a/theme/templates/email/trades/trade_update_sent.txt +++ b/theme/templates/email/trades/trade_update_sent.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -{{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has marked your trade as "Sent". +Great news! {{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has marked your trade as "Sent". Trade Details: - You have: {{ want_card }} @@ -8,8 +8,8 @@ Trade Details: What's next? Once you respond to the trade in the app, please mark the trade as "Received" in your dashboard. -Visit your dashboard to manage this trade: -{{ domain }}{% url 'dashboard' %} +Visit the trade update page to mark it "Received": +{{ domain }}{% url 'trade_acceptance_update' pk %} {% include 'email/common/footer.txt' %} diff --git a/theme/templates/email/trades/trade_update_thanked_by_acceptor.txt b/theme/templates/email/trades/trade_update_thanked_by_acceptor.txt index fdb5801..18dce90 100644 --- a/theme/templates/email/trades/trade_update_thanked_by_acceptor.txt +++ b/theme/templates/email/trades/trade_update_thanked_by_acceptor.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -{{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has sent their thanks for the successful trade! +{{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has sent their thanks for the successful trade! Trade Details: - They sent: {{ want_card }} @@ -8,8 +8,8 @@ Trade Details: What's next? Send a thank you to this user to increase their reputation! -Visit your dashboard to send thanks: -{{ domain }}{% url 'dashboard' %} +Visit the trade update page to send thanks: +{{ domain }}{% url 'trade_acceptance_update' pk %} {% include 'email/common/footer.txt' %} diff --git a/theme/templates/email/trades/trade_update_thanked_by_both.txt b/theme/templates/email/trades/trade_update_thanked_by_both.txt index 60dbfc0..0b3d791 100644 --- a/theme/templates/email/trades/trade_update_thanked_by_both.txt +++ b/theme/templates/email/trades/trade_update_thanked_by_both.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -{{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has sent their thanks for the successful trade! +{{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has sent their thanks for the successful trade! Trade Details: - {% if is_initiator %}You{% else %}They{% endif %} sent: {{ want_card }} @@ -8,6 +8,9 @@ Trade Details: This trade is now completed; no further actions can be made. +Visit your dashboard: +{{ domain }}{% url 'dashboard' %} + {% include 'email/common/footer.txt' %} Trade ID: #{{ hash }} \ No newline at end of file diff --git a/theme/templates/email/trades/trade_update_thanked_by_initiator.txt b/theme/templates/email/trades/trade_update_thanked_by_initiator.txt index 8ba2897..a26b519 100644 --- a/theme/templates/email/trades/trade_update_thanked_by_initiator.txt +++ b/theme/templates/email/trades/trade_update_thanked_by_initiator.txt @@ -1,6 +1,6 @@ {% include 'email/common/header.txt' %} -{{ acting_user }} ({{ acting_user_ign }} {{ acting_user_friend_code }}) has sent their thanks for the successful trade! +{{ acting_user }} ({{ acting_user_friend_code }}, in-game name: {{ acting_user_ign }}) has sent their thanks for the successful trade! Trade Details: - You sent: {{ want_card }} @@ -8,8 +8,8 @@ Trade Details: What's next? Send a thank you to this user to increase their reputation! -Visit your dashboard to send thanks: -{{ domain }}{% url 'dashboard' %} +Visit the trade update page to send thanks: +{{ domain }}{% url 'trade_acceptance_update' pk %} {% include 'email/common/footer.txt' %}