Commit 312a8535 authored by Porkepix's avatar Porkepix
Browse files

Clean unicode specific parts in files

Everything is unicode in Python3
parent 748adc80
...@@ -21,7 +21,7 @@ class Campaign(models.Model): ...@@ -21,7 +21,7 @@ class Campaign(models.Model):
choices=LANGUAGES, choices=LANGUAGES,
verbose_name=_('language')) verbose_name=_('language'))
def __unicode__(self): def __str__(self):
return self.title.decode('utf-8') return self.title.decode('utf-8')
...@@ -34,7 +34,7 @@ class Argumentary(models.Model): ...@@ -34,7 +34,7 @@ class Argumentary(models.Model):
verbose_name=_('language')) verbose_name=_('language'))
text = models.TextField(null=True) text = models.TextField(null=True)
def __unicode__(self): def __str__(self):
args = {'lang': self.lang, 'title': self.campaign.title} args = {'lang': self.lang, 'title': self.campaign.title}
return _('Argumentary in %(lang)s for %(title)s') % args return _('Argumentary in %(lang)s for %(title)s') % args
......
...@@ -12,7 +12,7 @@ class Contact(models.Model): ...@@ -12,7 +12,7 @@ class Contact(models.Model):
mail = models.CharField(max_length=255, blank=True) mail = models.CharField(max_length=255, blank=True)
photo = models.ImageField(upload_to='contacts/photos', blank=True) photo = models.ImageField(upload_to='contacts/photos', blank=True)
def __unicode__(self): def __str__(self):
return _(u'%(firstname)s %(lastname)s') % {'firstname': self.first_name, return _(u'%(firstname)s %(lastname)s') % {'firstname': self.first_name,
'lastname': self.last_name} 'lastname': self.last_name}
...@@ -24,5 +24,5 @@ class Contact(models.Model): ...@@ -24,5 +24,5 @@ class Contact(models.Model):
def get_photo_url(self): def get_photo_url(self):
if self.photo: if self.photo:
return self.photo.url return self.photo.url
return u'' return ''
...@@ -10,7 +10,7 @@ class Feedback(models.Model): ...@@ -10,7 +10,7 @@ class Feedback(models.Model):
category = models.ForeignKey(FeedbackCategory) category = models.ForeignKey(FeedbackCategory)
comment = models.CharField(max_length=512, blank=True) comment = models.CharField(max_length=512, blank=True)
def __unicode__(self): def __str__(self):
return _('feedback for %(callee contact)s on %(campaign title)s') % \ return _('feedback for %(callee contact)s on %(campaign title)s') % \
{'callee contact': self.callee.contact, {'callee contact': self.callee.contact,
'campaign title': self.callee.campaign.title} 'campaign title': self.callee.campaign.title}
...@@ -10,7 +10,7 @@ class Organization(models.Model): ...@@ -10,7 +10,7 @@ class Organization(models.Model):
users = models.ManyToManyField(User, null=True, blank=True, users = models.ManyToManyField(User, null=True, blank=True,
related_name='organizations') related_name='organizations')
def __unicode__(self): def __str__(self):
return self.name return self.name
...@@ -19,7 +19,7 @@ class GroupType(models.Model): ...@@ -19,7 +19,7 @@ class GroupType(models.Model):
organization = models.ForeignKey(Organization) organization = models.ForeignKey(Organization)
name = models.CharField(max_length=64) name = models.CharField(max_length=64)
def __unicode__(self): def __str__(self):
return self.name return self.name
...@@ -33,7 +33,7 @@ class Group(models.Model): ...@@ -33,7 +33,7 @@ class Group(models.Model):
contacts = models.ManyToManyField(Contact, null=True, blank=True, contacts = models.ManyToManyField(Contact, null=True, blank=True,
related_name='groups') related_name='groups')
def __unicode__(self): def __str__(self):
return self.name return self.name
...@@ -42,5 +42,5 @@ class FeedbackCategory(models.Model): ...@@ -42,5 +42,5 @@ class FeedbackCategory(models.Model):
name = models.CharField(max_length=64) name = models.CharField(max_length=64)
organization = models.ForeignKey(Organization) organization = models.ForeignKey(Organization)
def __unicode__(self): def __str__(self):
return self.name return self.name
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment