diff --git a/bda/forms.py b/bda/forms.py index 213ec17b..9c73ff5f 100644 --- a/bda/forms.py +++ b/bda/forms.py @@ -1,5 +1,7 @@ # coding: utf-8 +from __future__ import unicode_literals + from django import forms from django.forms.models import BaseInlineFormSet from bda.models import Spectacle @@ -33,7 +35,7 @@ class TokenForm(forms.Form): class SpectacleModelChoiceField(forms.ModelChoiceField): def label_from_instance(self, obj): - return u"%s le %s (%s) à %.02f€" % (obj.title, obj.date_no_seconds(), + return "%s le %s (%s) à %.02f€" % (obj.title, obj.date_no_seconds(), obj.location, obj.price) diff --git a/gestioncof/admin.py b/gestioncof/admin.py index 1c9ea5ca..fb188f4b 100644 --- a/gestioncof/admin.py +++ b/gestioncof/admin.py @@ -213,7 +213,7 @@ class PetitCoursAttributionCounterAdmin(admin.ModelAdmin): def reset(self, request, queryset): queryset.update(count=0) - reset.short_description = u"Remise à zéro du compteur" + reset.short_description = "Remise à zéro du compteur" class PetitCoursDemandeAdmin(admin.ModelAdmin): diff --git a/gestioncof/forms.py b/gestioncof/forms.py index bf983df5..7479586e 100644 --- a/gestioncof/forms.py +++ b/gestioncof/forms.py @@ -1,5 +1,7 @@ # coding: utf-8 +from __future__ import unicode_literals + from django import forms from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User @@ -169,8 +171,8 @@ class EventStatusFilterForm(forms.Form): class UserProfileForm(forms.ModelForm): - first_name = forms.CharField(label=_(u'Prénom'), max_length=30) - last_name = forms.CharField(label=_(u'Nom'), max_length=30) + first_name = forms.CharField(label=_('Prénom'), max_length=30) + last_name = forms.CharField(label=_('Nom'), max_length=30) def __init__(self, *args, **kw): super(UserProfileForm, self).__init__(*args, **kw)