From 2586ec51528b54c741fd29662a46ebb29dc46933 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 3 Jun 2024 15:03:26 +0200 Subject: [PATCH 1/2] fix tournament status display --- tournaments/models/tournament.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index 27d927e..1d994ee 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -125,10 +125,16 @@ class Tournament(models.Model): return None def tournament_status_display(self): - #if self.is_canceled: - # return "Annulé" + if self.is_canceled is True: + return "Annulé" teams = self.teams() + if self.supposedly_in_progress() or self.end_date is not None: + teams = [t for t in teams if t.stage is not "Attente"] + if teams is not None: + return f"{len(teams)} équipes" + else: + return None if teams is not None and len(teams) > 0: return f"{len(teams)} inscriptions" else: From fe1a9aca22c20122d6082db660ee0284a4359bbf Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 3 Jun 2024 23:19:05 +0200 Subject: [PATCH 2/2] fix grammar in status --- tournaments/models/tournament.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index 1d994ee..506646f 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -131,12 +131,18 @@ class Tournament(models.Model): teams = self.teams() if self.supposedly_in_progress() or self.end_date is not None: teams = [t for t in teams if t.stage is not "Attente"] - if teams is not None: - return f"{len(teams)} équipes" + if teams is not None and len(teams) > 0: + word = "équipe" + if len(teams) > 1: + word = word + "s" + return f"{len(teams)} {word}" else: return None if teams is not None and len(teams) > 0: - return f"{len(teams)} inscriptions" + word = "inscription" + if len(teams) > 1: + word = word + "s" + return f"{len(teams)} {word}" else: return None