fix unicode for QBE introspection

diff --git a/project/dae/models.py b/project/dae/models.py
index aeba9f7..f5e65d5 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -133,7 +133,7 @@ class Poste(PosteWorkflow, models.Model):
     # Méta
     date_creation = models.DateTimeField(auto_now_add=True)
     date_modification = models.DateTimeField(auto_now=True)
-    date_debut = models.DateField(verbose_name="Date de début",
+    date_debut = models.DateField(verbose_name=u"Date de début",
                                     help_text=HELP_TEXT_DATE,
                                     null=True, blank=True)
     date_fin = models.DateField(null=True, blank=True,
@@ -380,9 +380,9 @@ class PostePiece(models.Model):
 class PosteComparaison(models.Model):
     poste = models.ForeignKey('Poste', related_name='comparaisons_internes')
     implantation = models.ForeignKey(ref.Implantation, null=True, blank=True, related_name="+")
-    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name='Statut', null=True, blank=True, )
-    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name='Classement', null=True, blank=True, )
-    nom = models.CharField(verbose_name="Poste", max_length=255, null=True, blank=True)
+    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name=u'Statut', null=True, blank=True, )
+    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name=u'Classement', null=True, blank=True, )
+    nom = models.CharField(verbose_name=u"Poste", max_length=255, null=True, blank=True)
     montant = models.IntegerField(null=True)
     devise = models.ForeignKey(rh.Devise, default=5, related_name='+', null=True, blank=True)
 
@@ -657,8 +657,8 @@ class DossierComparaison(models.Model):
     Photo d'une comparaison salariale au moment de l'embauche.
     """
     dossier = models.ForeignKey('Dossier', related_name='comparaisons')
-    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name='Statut', null=True, blank=True, )
-    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name='Classement', null=True, blank=True, )
+    statut = models.ForeignKey(rh.Statut, related_name='+', verbose_name=u'Statut', null=True, blank=True, )
+    classement = models.ForeignKey(rh.Classement, related_name='+', verbose_name=u'Classement', null=True, blank=True, )
     implantation = models.ForeignKey(ref.Implantation, null=True, blank=True)
     poste = models.CharField(max_length=255, null=True, blank=True)
     personne = models.CharField(max_length=255, null=True, blank=True)

diff --git a/project/recrutement/models.py b/project/recrutement/models.py
index 3b30f2b..2b4f2bd 100755 (executable)
--- a/project/recrutement/models.py
+++ b/project/recrutement/models.py
@@ -66,8 +66,8 @@ class OffreEmploiManager(models.Manager):
 class ProxyOffreEmploi(emploi.OffreEmploi):
     class Meta:
         proxy = True
-        verbose_name = "Offre d'emploi (visualisation)"
-        verbose_name_plural = "Offres d'emploi (visualisation)"
+        verbose_name = u"Offre d'emploi (visualisation)"
+        verbose_name_plural = u"Offres d'emploi (visualisation)"
 
     def __unicode__(self):
         return '%s [%s] - View' % (self.nom, self.id)
@@ -75,14 +75,14 @@ class ProxyOffreEmploi(emploi.OffreEmploi):
 class ProxyCandidat(emploi.Candidat):
     class Meta:
         proxy = True
-        verbose_name = "Candidat (visualisation)"
-        verbose_name_plural = "Candidats (visualisation)"
+        verbose_name = u"Candidat (visualisation)"
+        verbose_name_plural = u"Candidats (visualisation)"
 
     def __unicode__(self):
         return '%s %s [%s]' % (self.prenom, self.nom, self.id)
 
 class Evaluateur(models.Model):
-    user = models.ForeignKey(User, unique=True, verbose_name="Évaluateur")
+    user = models.ForeignKey(User, unique=True, verbose_name=u"Évaluateur")
     offres_emploi = models.ManyToManyField(emploi.OffreEmploi, 
                 related_name="evaluateurs", blank=True)
 
@@ -95,20 +95,20 @@ class Evaluateur(models.Model):
         super(Evaluateur, self).save(*args, **kwargs)
     
     class Meta:
-        verbose_name = "évaluateur"
+        verbose_name = u"évaluateur"
 
     def __unicode__(self):
         return '%s %s' % (self.user.first_name, self.user.last_name)
 
 class AdministrateurRegional(models.Model):
     user = models.ForeignKey(User, unique=True,
-            verbose_name="Administrateur régionnal")
+            verbose_name=u"Administrateur régionnal")
     regions = models.ManyToManyField(ref.Region, 
-                           verbose_name="Régions", )
+                           verbose_name=u"Régions", )
 
     class Meta:
-        verbose_name = "administrateur régional"
-        verbose_name_plural = "administrateurs régionaux"
+        verbose_name = u"administrateur régional"
+        verbose_name_plural = u"administrateurs régionaux"
 
     def __unicode__(self):
         return '%s %s' % (self.user.first_name, self.user.last_name)
@@ -117,15 +117,15 @@ class CandidatEvaluation(models.Model):
     candidat = models.ForeignKey(emploi.Candidat, db_column='candidat', 
                 related_name='+',) 
     evaluateur = models.ForeignKey(Evaluateur, db_column='evaluateur', 
-                    related_name='+', verbose_name='Évaluateur') 
+                    related_name='+', verbose_name=u'Évaluateur') 
     note = models.IntegerField(choices=NOTES, blank=True, null=True)
     commentaire = models.TextField(null=True, blank=True, default='Aucun')
     date = models.DateField(auto_now_add=True,
                         help_text=HELP_TEXT_FORMAT_DATE, )  
 
     class Meta:
-        verbose_name = 'évaluation du candidat'
-        verbose_name_plural = 'évaluations des candidats'
+        verbose_name = u'évaluation du candidat'
+        verbose_name_plural = u'évaluations des candidats'
 
 #### TEMPLATE COURRIEL
 TEMPLATE_CHOICES = (
@@ -134,11 +134,11 @@ TEMPLATE_CHOICES = (
 )
 
 class CourrielTemplate(models.Model):
-    nom_modele = models.CharField(max_length=100, verbose_name='Nom du modèle',)
-    sujet = models.CharField(max_length=100, verbose_name='Sujet du courriel')
-    plain_text = models.TextField(verbose_name='Texte', 
+    nom_modele = models.CharField(max_length=100, verbose_name=u'Nom du modèle',)
+    sujet = models.CharField(max_length=100, verbose_name=u'Sujet du courriel')
+    plain_text = models.TextField(verbose_name=u'Texte', 
                                     help_text=HELP_TEXT_TAGS_ACCEPTES,  )
-    html = tinymce_models.HTMLField(verbose_name='Texte en HTML', 
+    html = tinymce_models.HTMLField(verbose_name=u'Texte en HTML', 
                                     help_text=HELP_TEXT_TAGS_ACCEPTES,  )
 
     def __unicode__(self):
@@ -148,20 +148,20 @@ class CourrielTemplate(models.Model):
         ordering = ['nom_modele',]
 
 class CandidatCourriel(models.Model):
-    candidats = models.ManyToManyField(Candidat, verbose_name="Candidats", )
+    candidats = models.ManyToManyField(Candidat, verbose_name=u"Candidats", )
     template = models.ForeignKey(CourrielTemplate, db_column='template', 
-                related_name='+', verbose_name="Modèle de courriel", )
+                related_name='+', verbose_name=u"Modèle de courriel", )
     sujet = models.CharField(max_length=255, blank=True, 
                                 help_text=HELP_TEXT_TAGS_ACCEPTES, )
-    plain_text = models.TextField(verbose_name='Texte', blank=True,
+    plain_text = models.TextField(verbose_name=u'Texte', blank=True,
                                     help_text=HELP_TEXT_TAGS_ACCEPTES,  )
-    html = tinymce_models.HTMLField(verbose_name='Texte en HTML', null=True, 
+    html = tinymce_models.HTMLField(verbose_name=u'Texte en HTML', null=True, 
                                 blank=True, help_text=HELP_TEXT_TAGS_ACCEPTES, )
 
     def __unicode__(self):
         return '%s' % (self.titre)
 
     class Meta:
-        verbose_name = "modèle de courriel"
-        verbose_name_plural = "modèles de courriel"
+        verbose_name = u"modèle de courriel"
+        verbose_name_plural = u"modèles de courriel"
     

diff --git a/project/rh/forms.py b/project/rh/forms.py
index 84cf682..2791947 100644 (file)
--- a/project/rh/forms.py
+++ b/project/rh/forms.py
@@ -12,7 +12,7 @@ class FormDate(object):
           return date_fin
         date_debut = self.cleaned_data['date_debut']
         if date_fin < date_debut:
-            raise forms.ValidationError("La date de fin est antérieure à la date de début")
+            raise forms.ValidationError(u"La date de fin est antérieure à la date de début")
         return date_fin
 
 class DossierForm(forms.ModelForm, FormDate):

diff --git a/project/rh/models.py b/project/rh/models.py
index b9f954d..6999d12 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -162,10 +162,10 @@ class Poste_(AUFMetadata):
 
     # Autres Metadata
     date_validation = models.DateTimeField(null=True, blank=True)   # de dae
-    date_debut = models.DateField(verbose_name="Date de début",
+    date_debut = models.DateField(verbose_name=u"Date de début",
                             help_text=HELP_TEXT_DATE,
                             null=True, blank=True)
-    date_fin = models.DateField(verbose_name="Date de fin",
+    date_fin = models.DateField(verbose_name=u"Date de fin",
                             help_text=HELP_TEXT_DATE,
                             null=True, blank=True)
 
@@ -500,7 +500,7 @@ class Dossier_(AUFMetadata):
     class Meta:
         abstract = True
         ordering = ['employe__nom', ]
-        verbose_name = "Dossier"
+        verbose_name = u"Dossier"
         verbose_name_plural = "Dossiers"
         
     def __unicode__(self):

diff --git a/project/urls.py b/project/urls.py
index cf14e27..758cf77 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -10,7 +10,7 @@ handler500 # Pyflakes
 
 urlpatterns = patterns(
     '',
-    (r'^$', 'project.views.index'),
+    (r'^$', 'project.views.accueil'),
     #url(r'^private_files/', include('private_files.urls')),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^admin_tools/', include('admin_tools.urls')),

diff --git a/src/auf.django.emploi/auf/django/emploi/models.py b/src/auf.django.emploi/auf/django/emploi/models.py
index 8fa2e92..e144071 100755 (executable)
--- a/src/auf.django.emploi/auf/django/emploi/models.py
+++ b/src/auf.django.emploi/auf/django/emploi/models.py
@@ -69,28 +69,28 @@ class Metadata(models.Model):
 
 class OffreEmploi(Metadata):
     est_affiche = models.BooleanField(default=False, 
-                                    verbose_name="En affichage sur le site")
+                                    verbose_name=u"En affichage sur le site")
     statut = models.CharField(max_length=4, choices=STATUT_OFFRE_EMPLOI_CHOICES,
                                 default='NOUV')
     nom = models.CharField(max_length=255)
-    resume = models.TextField(verbose_name="Résumé")
+    resume = models.TextField(verbose_name=u"Résumé")
     description = models.TextField()
     poste = models.CharField(max_length=255)
     poste_nom = models.CharField(max_length=255)
-    date_limite = models.DateField(verbose_name="Date limite",
+    date_limite = models.DateField(verbose_name=u"Date limite",
                         help_text=HELP_TEXT_FORMAT_DATE,)  
     region = models.ForeignKey(ref.Region, db_column='region', 
-                verbose_name="Région")
+                verbose_name=u"Région")
     bureau = models.ForeignKey(ref.Bureau, db_column='bureau', )
     duree_affectation = models.CharField(max_length=255, 
-                        verbose_name="Durée de l'affectation")
+                        verbose_name=u"Durée de l'affectation")
     renumeration = models.CharField(max_length=255,
-                    verbose_name='Rénumération')
-    debut_affectation = models.DateField(verbose_name="Début de l'affectation",
+                    verbose_name=u'Rénumération')
+    debut_affectation = models.DateField(verbose_name=u"Début de l'affectation",
                         help_text=HELP_TEXT_FORMAT_DATE,)
     lieu_affectation = models.ForeignKey(ref.Implantation,  
                         db_column='implantation', 
-                        verbose_name="Lieu d'affectation")
+                        verbose_name=u"Lieu d'affectation")
 
     class Meta:
         db_table = 'emploi_offreemploi'
@@ -104,30 +104,30 @@ class Candidat(Metadata):
                 default='NOUV')
     offre_emploi = models.ForeignKey('OffreEmploi', db_column='offre_emploi',
                     related_name='+')
-    prenom = models.CharField(max_length=255, verbose_name='Prénom', )
+    prenom = models.CharField(max_length=255, verbose_name=u'Prénom', )
     nom = models.CharField(max_length=255)
     genre = models.CharField(max_length=1, choices=GENRE_CHOICES)
     nationalite = models.ForeignKey(ref.Pays, 
                     db_column='nationalite', related_name='+',
-                    verbose_name='Nationalité')
+                    verbose_name=u'Nationalité')
     situation_famille = models.CharField(max_length=1, 
                         choices=SITUATION_CHOICES, 
-                        verbose_name='Situation familiale', )
-    nombre_dependant = models.IntegerField(verbose_name='Nombre de dépendant',
+                        verbose_name=u'Situation familiale', )
+    nombre_dependant = models.IntegerField(verbose_name=u'Nombre de dépendant',
                         help_text=HELP_TEXT_NB_DEPENDANT, )
     niveau_diplome = models.CharField(max_length=255,
-                        verbose_name='Niveau du diplôme')
+                        verbose_name=u'Niveau du diplôme')
     employeur_actuel = models.CharField(max_length=255, )
     poste_actuel = models.CharField(max_length=255, )
     domaine_professionnel = models.CharField(max_length=255, )
-    telephone = models.CharField(max_length=255, verbose_name='Téléphone', )
-    email = models.EmailField(max_length=255, verbose_name = 'Courriel', )
+    telephone = models.CharField(max_length=255, verbose_name=u'Téléphone', )
+    email = models.EmailField(max_length=255, verbose_name = u'Courriel', )
 
     # Adresse
     adresse = models.CharField(max_length=255)
     ville = models.CharField(max_length=255)
     etat_province = models.CharField(max_length=255, 
-                    verbose_name="État/Province")
+                    verbose_name=u"État/Province")
     code_postal = models.CharField(max_length=255, blank=True)
     pays = models.ForeignKey(ref.Pays, db_column='pays',
             related_name='+')
@@ -157,12 +157,12 @@ class CandidatPiece(models.Model):
     candidat = models.ForeignKey(Candidat, db_column='candidat',
                 related_name='candidat_piece') 
     nom = models.CharField(max_length=3, choices=TYPE_PIECE_CHOICES)
-    path = models.FileField(verbose_name="Fichier", 
+    path = models.FileField(verbose_name=u"Fichier", 
                         upload_to=candidat_piece_dispatch, storage=storage_prive)
 
     class Meta:
         db_table = 'emploi_pieces'
-        verbose_name = "pièce jointe"
+        verbose_name = u"pièce jointe"
         verbose_name_plural = "pièces jointes"
 
     def __unicode__(self):

diff --git a/src/qbe b/src/qbe
index 3ef7458..2503a3e 160000 (submodule)
--- a/src/qbe
+++ b/src/qbe
@@ -1 +1 @@
-Subproject commit 3ef7458861a78179eed8717212c509be47a2130f
+Subproject commit 2503a3ecb80a3e1d76316c5a0badac18e5b838fb