summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--django/sp_sso/locale_dir/fr/LC_MESSAGES/django.po47
-rw-r--r--django/sp_sso/saml/forms.py27
-rw-r--r--django/sp_sso/saml/views.py17
-rw-r--r--django/sp_sso/templates/index.html10
4 files changed, 67 insertions, 34 deletions
diff --git a/django/sp_sso/locale_dir/fr/LC_MESSAGES/django.po b/django/sp_sso/locale_dir/fr/LC_MESSAGES/django.po
index 8acc604..5ea1fb2 100644
--- a/django/sp_sso/locale_dir/fr/LC_MESSAGES/django.po
+++ b/django/sp_sso/locale_dir/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 08:10+0000\n"
+"POT-Creation-Date: 2017-07-03 16:10+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -176,21 +176,25 @@ msgid ""
" Condorcet account base."
msgstr "Votre compte est déjà créé dans la base du Campus Condorcet."
-#: saml/views.py:49
+#: saml/views.py:48
msgid ""
-" sent an invite with the following invitation message:\n"
-"\""
-msgstr " vous a envoyé une invitation contenant le message suivant : \""
-
-#: saml/views.py:51
-msgid ""
-"Please check the entries below, fill in the empty fields\n"
+"%s %s sent an invite with the following invitation\n"
+" message:\n"
+"\n"
+" \"%s\"\n"
+"\n"
+" Please check the entries below, fill in the empty "
+"fields\n"
" and submit your account request.\n"
msgstr ""
+"%s %s vous a envoyé une invitation contenant le message suivant :\n"
+"\n"
+"\"%s\"\n"
+"\n"
"Veuillez confirmer les éléments ci-dessous, compléter les champs vides et "
"valider votre demande d'inscription.\n"
-#: saml/views.py:54
+#: saml/views.py:57
msgid "Please fill in the empty fields and submit your account request"
msgstr ""
"Veuillez compléter les champs vides et valider votre demande d'inscription."
@@ -225,27 +229,27 @@ msgstr "Bienvenue sur le site d'inscription au Campus Condorcet !"
#: templates/index.html:17
msgid "Your are moving in to the Campus"
-msgstr "Vous emménagez sur le site du Campus"
+msgstr "Vous emménagez sur le Campus"
#: templates/index.html:18
-msgid "Register"
-msgstr "Vous inscrire"
+msgid "Register using your Campus institution account"
+msgstr "Inscription via votre établissement d'appartenance"
#: templates/index.html:19
-msgid "You have been invited to register to the Campus"
-msgstr "Vous êtes invité"
+msgid "You have been invited by a member of the Campus"
+msgstr "Vous êtes invité par un membre du Campus"
#: templates/index.html:20
-msgid "Register using your source institution account"
-msgstr "Inscription via votre établissement d'appartenance"
+msgid "Register using your origin institution account"
+msgstr "Inscription via votre établissement d'origine"
#: templates/index.html:21
msgid "Register using an empty form"
-msgstr "Formulaire libre"
+msgstr "Inscription libre"
#: templates/index.html:22
msgid "You would like to invite somebody to the Campus"
-msgstr "Vous souhaitez inviter"
+msgstr "Vous souhaitez inviter une ou plusieurs personnes sur le Campus"
#: templates/index.html:23
msgid "Send invites"
@@ -283,6 +287,11 @@ msgid ""
" "
msgstr ""
+#~ msgid ""
+#~ " sent an invite with the following invitation message:\n"
+#~ "\""
+#~ msgstr " vous a envoyé une invitation contenant le message suivant : \""
+
#~ msgid "Your institution and research unit aren't declared to the Campus."
#~ msgstr ""
#~ "Votre établissement et votre unité ne sont pas présents sur le Campus."
diff --git a/django/sp_sso/saml/forms.py b/django/sp_sso/saml/forms.py
index 5f51d31..90c452f 100644
--- a/django/sp_sso/saml/forms.py
+++ b/django/sp_sso/saml/forms.py
@@ -22,11 +22,32 @@ AFFECTATION_CHOICES = (
)
EMP_CORPS_CHOICES = (
- ('PROFESSEUR ASSOCIE', _('ASSOCIATE TEACHER')),
- ('PROFESSEUR DES UNIVERSITES', _('UNIVERSITY TEACHER')),
- ('MAITRE DE CONFERENCES DES UNIVERSITES', _('UNIVERSITY LECTURER')),
+('{NCORPS}051', "ATTACHE D'ADMINISTRATION DE L'ETAT"),
+('{NCORPS}054', 'SECRETAIRE ADMINISTRATIF'),
+('{NCORPS}056', " ADJ. ADM DE L'EN ET DE L'ENS SUP "),
+('{NCORPS}275', 'ASSISTANT INGENIEUR ( RECHERCHE CNRS)'),
+('{NCORPS}276', "INGENIEUR D'ETUDES( RECHERCHE CNRS)"),
+('{NCORPS}277', 'INGENIEUR DE RECHERCHE ( RECHERCHE CNRS)'),
+('{NCORPS}278', 'ADJOINT TECHNIQUE ( RECHERCHE CNRS)'),
+('{NCORPS}279', 'TECHNICIEN ( RECHERCHE CNRS)'),
+('{NCORPS}300', 'PROFESSEUR DES UNIVERSITES'),
+('{NCORPS}301', 'MAITRE DE CONFERENCES DES UNIVERSITES'),
+('{NCORPS}305', "ASSISTANT DE L'ENSEIGNEMENT SUPERIEUR"),
+('{NCORPS}310', 'PROF DES UNIV.- PRATICIEN HOSPITALIER'),
+('{NCORPS}311', 'MAITRE DE CONF PRATICIEN HOSPITALIER '),
+('{NCORPS}355', "DIR. D'ETUDES EPHE ENC EFEO"),
+('{NCORPS}551', 'PROFESSEUR AGREGE'),
+('{NCORPS}553', 'PROFESSEUR CERTIFIE'),
+('{NCORPS}562', "CHARGE D'ENSEIGNEMENT HORS EPS"),
+('{NCORPS}830', 'TECHNICIEN DE RECHERCHE & FORMATION(NES)'),
+('{NCORPS}835', "INGENIEUR D'ETUDES (RECH ET FORM)"),
+('{NCORPS}836', 'INGENIEUR DE RECHERCHE (RECH ET FORM)'),
+('{NCORPS}837', 'ADJOINT TECHNIQUE DE RECH.ET FORMATION'),
+('{NCORPS}839', 'ADJOINT TECHNIQUE-RECHERCHE & FORMATION'),
+('{NCORPS}841', 'TECHNIQUE CONTRACTUEL CNRS')
)
+
ETABLISSEMENT_CHOICES = ()
UNITE_CHOICES = ()
diff --git a/django/sp_sso/saml/views.py b/django/sp_sso/saml/views.py
index 06195e6..a142efa 100644
--- a/django/sp_sso/saml/views.py
+++ b/django/sp_sso/saml/views.py
@@ -1,6 +1,6 @@
import logging
from django.views.generic import FormView
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ugettext as ugt
from .forms import RegistrationForm
from .utils import ldap_contains_user, wcs_submit, sso_attributes, \
@@ -42,14 +42,17 @@ class RegistrationFormView(FormView):
if self.request.session.get('tracking_code'):
initial.update(initial_from_tracking_code(
self.request.session['tracking_code']))
+ message = initial['message'] if initial.get('message') else ''
initial['user_help_msg'] = \
- initial.get('hote_prenom')+' '+initial.get('hote_nom')\
- +_(
- ' sent an invite with the following invitation message:\n"'
- ) + initial['message'] + '"\n' + _(
- """Please check the entries below, fill in the empty fields
- and submit your account request.\n""")
+ _("""%s %s sent an invite with the following invitation
+ message:\n
+ "%s"\n
+ Please check the entries below, fill in the empty fields
+ and submit your account request.\n""") % (
+ initial.get('hote_prenom'),
+ initial.get('hote_nom'),
+ message)
else:
initial['user_help_msg'] = _("Please fill in the empty fields and "
"submit your account request")
diff --git a/django/sp_sso/templates/index.html b/django/sp_sso/templates/index.html
index 2ef870b..f6696e3 100644
--- a/django/sp_sso/templates/index.html
+++ b/django/sp_sso/templates/index.html
@@ -14,12 +14,12 @@
<div id="padding-left">&nbsp;</div>
<div id="centered-column">
<p style='text-align:center'>
-<h2>{% trans "Your are moving in to the Campus" %}</h2>
-<a class='button inline' href="{% url "declare" %}">{% trans "Register" %}</a><br/><br/>
-<h2>{% trans "You have been invited to register to the Campus" %}</h2>
-<a class='button inline' href="{% url "auth_login" %}">{% trans "Register using your source institution account" %}</a><br/><br/>
+<h2 style='color:#21C910'>{% trans "Your are moving in to the Campus" %}</h2>
+<a class='button inline' href="{% url "declare" %}">{% trans "Register using your Campus institution account" %}</a><br/><br/>
+<h2 style='color:#109BC9'>{% trans "You have been invited by a member of the Campus" %}</h2>
+<a class='button inline' href="{% url "auth_login" %}">{% trans "Register using your origin institution account" %}</a><br/><br/>
<a class='button inline' href="{% url "register" %}">{% trans "Register using an empty form" %}</a><br/><br/>
-<h2>{% trans "You would like to invite somebody to the Campus" %}</h2>
+<h2 style='color:#D85D5D'>{% trans "You would like to invite somebody to the Campus" %}</h2>
<a class='button inline' href="{% url "invitation" %}">{% trans "Send invites" %}</a><br/>
</div>
<div id="padding-right">&nbsp;</div>