klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'teeshirt' into 'master'

Browse Source 
Fix translations error for gifts

See merge request ae/Sith!131
This commit is contained in:
Antoine Bartuccio 2017-11-14 10:23:32 +01:00
commit 42f8ee3518
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/models.py
View File

@ -1118,7 +1118,14 @@ class Gift(models.Model):
user = models.ForeignKey(User, related_name='gifts') user = models.ForeignKey(User, related_name='gifts')
def __str__(self): def __str__(self):
return "%s - %s" % (self.label, self.date.strftime('%d %b %Y')) return "%s - %s" % (self.translated_label, self.date.strftime('%d %b %Y'))
@property
def translated_label(self):
translations = [label[1] for label in settings.SITH_GIFT_LIST if label[0] == self.label]
if len(translations) > 0:
return translations[0]
return self.label
def is_owned_by(self, user): def is_owned_by(self, user):
return user.is_board_member or user.is_root return user.is_board_member or user.is_root