diff options
Diffstat (limited to 'core/models/troggle.py')
| -rw-r--r-- | core/models/troggle.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/models/troggle.py b/core/models/troggle.py index 947ba21..b118d78 100644 --- a/core/models/troggle.py +++ b/core/models/troggle.py @@ -63,7 +63,7 @@ class DataIssue(TroggleModel): ordering = ['date'] def __str__(self): - return "%s - %s" % (self.parser, self.message) + return f"{self.parser} - {self.message}" # # single Expedition, usually seen by year @@ -90,7 +90,7 @@ class Expedition(TroggleModel): if len(expeditiondays) == 1: return expeditiondays[0] else: - message ='! - more than one datum in an expeditionday: {}'.format(date) + message =f'! - more than one datum in an expeditionday: {date}' DataIssue.objects.create(parser='expedition', message=message) return expeditiondays[0] res = ExpeditionDay(expedition=self, date=date) @@ -139,7 +139,7 @@ class Person(TroggleModel): def __str__(self): if self.last_name: - return "%s %s" % (self.first_name, self.last_name) + return f"{self.first_name} {self.last_name}" return self.first_name @@ -205,14 +205,14 @@ class PersonExpedition(TroggleModel): #order_with_respect_to = 'expedition' def __str__(self): - return "%s: (%s)" % (self.person, self.expedition) + return f"{self.person}: ({self.expedition})" #why is the below a function in personexpedition, rather than in person? - AC 14 Feb 09 def name(self): if self.nickname: - return "%s (%s) %s" % (self.person.first_name, self.nickname, self.person.last_name) + return f"{self.person.first_name} ({self.nickname}) {self.person.last_name}" if self.person.last_name: - return "%s %s" % (self.person.first_name, self.person.last_name) + return f"{self.person.first_name} {self.person.last_name}" return self.person.first_name def get_absolute_url(self): |