klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-12-23 08:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix for requestGala

Browse Source
This commit is contained in:
Cyl 2019-10-14 00:32:11 +02:00
parent 5a55a6c642
commit aac4e3b99c
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
counter/models.py
View File

@ -490,7 +490,7 @@ class Selling(models.Model):
event = self.product.eticket.event_title or _("Unknown event") event = self.product.eticket.event_title or _("Unknown event")
subject = _("Eticket bought for the event %(event)s") % {"event": event} subject = _("Eticket bought for the event %(event)s") % {"event": event}
message_html = _( message_html = _(
"You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retreive all your e-tickets on your account page %(url)s." "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retrieve all your e-tickets on your account page %(url)s."
) % { ) % {
"event": event, "event": event,
"url": "".join( "url": "".join(
@ -502,14 +502,22 @@ class Selling(models.Model):
"</a>", "</a>",
) )
), ),
"eticket": "<a href=\"" + self.get_eticket_full_url() + "\">" + self.get_eticket_full_url() + "</a>" "eticket": "".join(
(
'<a href="',
self.get_eticket_full_url(),
'">',
self.get_eticket_full_url(),
"</a>",
)
),
} }
message_txt = _( message_txt = _(
"You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retreive all your e-tickets on your account page %(url)s." "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retrieve all your e-tickets on your account page %(url)s."
) % { ) % {
"event": event, "event": event,
"url": self.customer.get_full_url(), "url": self.customer.get_full_url(),
"eticket": "<a href=\"" + self.get_eticket_full_url() + "\">" + self.get_eticket_full_url() + "</a>" "eticket": self.get_eticket_full_url(),
} }
self.customer.user.email_user(subject, message_txt, html_message=message_html) self.customer.user.email_user(subject, message_txt, html_message=message_html)
@ -597,11 +605,7 @@ class Selling(models.Model):
def get_eticket_full_url(self): def get_eticket_full_url(self):
eticket_url = reverse("counter:eticket_pdf", kwargs={"selling_id": self.id}) eticket_url = reverse("counter:eticket_pdf", kwargs={"selling_id": self.id})
return "".join( return "".join(["https://", settings.SITH_URL, eticket_url])
[
"https://", settings.SITH_URL, eticket_url
]
)
class Permanency(models.Model): class Permanency(models.Model):

4
locale/fr/LC_MESSAGES/django.po
View File

@ -2724,7 +2724,7 @@ msgstr ""
#: core/templates/core/login.jinja:18 #: core/templates/core/login.jinja:18
msgid "Please login or create an account to see this page." msgid "Please login or create an account to see this page."
msgstr "Merci de vous identifier ou vous créer un compte pour voir cette page." msgstr "Merci de vous identifier ou de créer un compte pour voir cette page."
#: core/templates/core/login.jinja:28 #: core/templates/core/login.jinja:28
#: counter/templates/counter/counter_main.jinja:51 #: counter/templates/counter/counter_main.jinja:51
@ -3822,7 +3822,7 @@ msgstr "Eticket acheté pour l'événement %(event)s"
msgid "" msgid ""
"You bought an eticket for the event %(event)s.\n" "You bought an eticket for the event %(event)s.\n"
"You can download it directly from this link %(eticket)s.\n" "You can download it directly from this link %(eticket)s.\n"
"You can also retreive all your e-tickets on your account page %(url)s." "You can also retrieve all your e-tickets on your account page %(url)s."
msgstr "" msgstr ""
"Vous avez acheté un e-ticket pour l'événement %(event)s.\n" "Vous avez acheté un e-ticket pour l'événement %(event)s.\n"
"Vous pouvez le télécharger directement depuis ce lien: %(eticket)s.\n" "Vous pouvez le télécharger directement depuis ce lien: %(eticket)s.\n"