mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 01:16:27 +00:00
Merge branch 'fix_ticket_name' into 'dev'
Fix name format for tickets See merge request re2o/re2o!528
This commit is contained in:
commit
65b624df58
2 changed files with 4 additions and 5 deletions
|
@ -21,7 +21,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: 2.5\n"
|
"Project-Id-Version: 2.5\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2020-04-24 18:45+0200\n"
|
"POT-Creation-Date: 2020-05-03 02:10+0200\n"
|
||||||
"PO-Revision-Date: 2019-11-16 00:35+0100\n"
|
"PO-Revision-Date: 2019-11-16 00:35+0100\n"
|
||||||
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
|
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
@ -59,9 +59,8 @@ msgid "tickets"
|
||||||
msgstr "tickets"
|
msgstr "tickets"
|
||||||
|
|
||||||
#: tickets/models.py:82
|
#: tickets/models.py:82
|
||||||
#, python-format
|
msgid "Ticket from {name}. Date: {date}."
|
||||||
msgid "Ticket from %(name)s. Date: %(date)s."
|
msgstr "Ticket de {name}. Date : {date}."
|
||||||
msgstr "Ticket de %(name)s. Date : %(date)s."
|
|
||||||
|
|
||||||
#: tickets/models.py:84
|
#: tickets/models.py:84
|
||||||
#, python-format
|
#, python-format
|
||||||
|
|
|
@ -79,7 +79,7 @@ class Ticket(AclMixin, models.Model):
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
if self.user:
|
if self.user:
|
||||||
return _("Ticket from %(name)s. Date: %(date)s.").format(name=self.user.surname, date=self.date)
|
return _("Ticket from {name}. Date: {date}.").format(name=self.user.get_full_name(),date=self.date)
|
||||||
else:
|
else:
|
||||||
return _("Anonymous ticket. Date: %s.") % (self.date)
|
return _("Anonymous ticket. Date: %s.") % (self.date)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue