From bfad2652995fbed505440124b8a0f3ee496b09ea Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 12 Dec 2015 18:21:10 +0100
Subject: [PATCH] Add a help_text to pattern of ServicePattern

---
 cas_server/locale/en/LC_MESSAGES/django.mo    | Bin 4614 -> 4614 bytes
 cas_server/locale/en/LC_MESSAGES/django.po    |  69 +++++++++--------
 cas_server/locale/fr/LC_MESSAGES/django.mo    | Bin 5599 -> 6033 bytes
 cas_server/locale/fr/LC_MESSAGES/django.po    |  73 ++++++++++--------
 .../migrations/0003_auto_20151212_1721.py     |  20 +++++
 cas_server/models.py                          |   7 +-
 6 files changed, 106 insertions(+), 63 deletions(-)
 create mode 100644 cas_server/migrations/0003_auto_20151212_1721.py

diff --git a/cas_server/locale/en/LC_MESSAGES/django.mo b/cas_server/locale/en/LC_MESSAGES/django.mo
index e379ae8dbb25cb04181f0865df2a55592fc313c9..9f500a4a8ccd65f8de3db288ce0723d5b3aef054 100644
GIT binary patch
delta 28
icmZouX;ay-j+4zu!O+6WXz~_LRTdy^u=y^hCI<j|9S8sb

delta 28
jcmZouX;ay-j+4z$!O+smbn+HXRTe`l6O+w%IW;)|dM*e8

diff --git a/cas_server/locale/en/LC_MESSAGES/django.po b/cas_server/locale/en/LC_MESSAGES/django.po
index 4735708..db87779 100644
--- a/cas_server/locale/en/LC_MESSAGES/django.po
+++ b/cas_server/locale/en/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cas_server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-11 19:50+0100\n"
-"PO-Revision-Date: 2015-12-12 11:44+0100\n"
+"POT-Creation-Date: 2015-12-12 18:20+0100\n"
+"PO-Revision-Date: 2015-12-12 18:20+0100\n"
 "Last-Translator: Valentin Samir <valentin.samir@crans.org>\n"
 "Language-Team: django <LL@li.org>\n"
 "Language: en\n"
@@ -45,94 +45,101 @@ msgstr "Clean deleted sessions"
 msgid "Clean old trickets"
 msgstr "Clean old trickets"
 
-#: models.py:88
+#: models.py:90
 #, python-format
 msgid "Error during service logout %s"
 msgstr "Error during service logout %s"
 
-#: models.py:158
+#: models.py:160
 msgid "position"
 msgstr "position"
 
-#: models.py:165 models.py:264
+#: models.py:167 models.py:271
 msgid "name"
 msgstr "name"
 
-#: models.py:166
+#: models.py:168
 msgid "A name for the service"
 msgstr "A name for the service"
 
-#: models.py:171 models.py:292 models.py:310
+#: models.py:173 models.py:299 models.py:317
 msgid "pattern"
 msgstr "pattern"
 
-#: models.py:177
+#: models.py:175
+msgid ""
+"A regular expression matching services. Will usually looks like '^https://"
+"some\\.server\\.com/path/.*$'.As it is a regular expression, special "
+"character must be escaped with a '\\'."
+msgstr ""
+
+#: models.py:184
 msgid "user field"
 msgstr ""
 
-#: models.py:178
+#: models.py:185
 msgid "Name of the attribut to transmit as username, empty = login"
 msgstr "Name of the attribut to transmit as username, empty = login"
 
-#: models.py:182
+#: models.py:189
 msgid "restrict username"
 msgstr ""
 
-#: models.py:183
+#: models.py:190
 msgid "Limit username allowed to connect to the list provided bellow"
 msgstr "Limit username allowed to connect to the list provided bellow"
 
-#: models.py:187
+#: models.py:194
 msgid "proxy"
 msgstr "proxy"
 
-#: models.py:188
+#: models.py:195
 msgid "Proxy tickets can be delivered to the service"
 msgstr "Proxy tickets can be delivered to the service"
 
-#: models.py:192
+#: models.py:199
 msgid "proxy callback"
 msgstr "proxy callback"
 
-#: models.py:193
+#: models.py:200
 msgid "can be used as a proxy callback to deliver PGT"
 msgstr "can be used as a proxy callback to deliver PGT"
 
-#: models.py:197
+#: models.py:204
 msgid "single log out"
 msgstr ""
 
-#: models.py:198
+#: models.py:205
 msgid "Enable SLO for the service"
 msgstr "Enable SLO for the service"
 
-#: models.py:205
+#: models.py:212
 msgid "single log out callback"
 msgstr ""
 
-#: models.py:206
+#: models.py:213
 msgid ""
 "URL where the SLO request will be POST. empty = service url\n"
 "This is usefull for non HTTP proxied services."
 msgstr ""
 
-#: models.py:249
+#: models.py:256
 msgid "username"
 msgstr ""
 
-#: models.py:250
+#: models.py:257
 msgid "username allowed to connect to the service"
 msgstr "username allowed to connect to the service"
 
-#: models.py:265
+#: models.py:272
 msgid "name of an attribut to send to the service, use * for all attributes"
 msgstr "name of an attribut to send to the service, use * for all attributes"
 
-#: models.py:270 models.py:316
+#: models.py:277 models.py:323
 msgid "replace"
 msgstr "replace"
 
-#: models.py:271
+#: models.py:278
 msgid ""
 "name under which the attribut will be showto the service. empty = default "
 "name of the attribut"
@@ -140,31 +147,31 @@ msgstr ""
 "name under which the attribut will be showto the service. empty = default "
 "name of the attribut"
 
-#: models.py:287 models.py:305
+#: models.py:294 models.py:312
 msgid "attribut"
 msgstr "attribut"
 
-#: models.py:288
+#: models.py:295
 msgid "Name of the attribut which must verify pattern"
 msgstr "Name of the attribut which must verify pattern"
 
-#: models.py:293
+#: models.py:300
 msgid "a regular expression"
 msgstr "a regular expression"
 
-#: models.py:306
+#: models.py:313
 msgid "Name of the attribut for which the value must be replace"
 msgstr "Name of the attribut for which the value must be replace"
 
-#: models.py:311
+#: models.py:318
 msgid "An regular expression maching whats need to be replaced"
 msgstr "An regular expression maching whats need to be replaced"
 
-#: models.py:317
+#: models.py:324
 msgid "replace expression, groups are capture by \\1, \\2 …"
 msgstr "replace expression, groups are capture by \\1, \\2 …"
 
-#: models.py:407
+#: models.py:416
 #, python-format
 msgid ""
 "Error during service logout %(service)s:\n"
diff --git a/cas_server/locale/fr/LC_MESSAGES/django.mo b/cas_server/locale/fr/LC_MESSAGES/django.mo
index c31f9adb4cdb44c087cf1b367f208ada0dc1a452..1fde40547b310a31bfa1063f6674fac28e6f8c42 100644
GIT binary patch
delta 1634
zcmZ|OU1%It6u|M5x~6SfKayx-zwB*OyV}OtWa~$a)zGF;5Q>yitgsZOlk4u-nb~DN
zVnV?ckt%`GN|4}_@kNpfLK}S%AEXO?6ci*+D(HhED87jJAoYJH6D$QUd-r!|X7Ai{
z&$;`<!FMa|@B2#c3GE5`PWl&JBFC|I7hklQlE?tg;&r@&Pvhj>BG2Q6!q4$3uK&hO
zIMOZhFg}Ai{|xqFv$%c}w~MspeFjw?e2O~ZXM6y=H;O!mJ8(C?j69NAWDR+vxW0&E
zTwlUx@g_RBfhg|5QG6UHP&XK&1~iBLtS=uj(A|HAui~$$3!dJ*7D!e&hdh!GP#0K2
z4P+HbihPI1@JBq0<({?QUqoV(%f<Bq>byn0&-(Ha0}bF4?8Tq-0se`6<R89t;Z0ja
z4qz|pf`{=k<vN18qp!D${Eok%2C~ZbPvXvdMUG;GnxSjO^>5hT%Z-uyME2k*q$ZN#
zAYQ>;xP&j_O+1VP_fvm7g=cU9_v0VfML>h>f+WZ`3eFT6LY;RAr?7<w@!LM~{~&{|
zevv0}5X*Q1HJ}VX#s$<JO>!_U;X9}=7+|u&qo{#<sF`{l$MJ0>IdTK_Jb#5R;5UW4
z2FO3zk_P$Hnq;UixKLcbh5CFBCvXAvY^<V|=r7cg-74%QZF(4oP)k}v5|ST4{k;aQ
zC0%d3wf=^#>DH!;ueZk-9HMIp^kwU<!a#%49Ss*ZAH^!2jpdC5<)__2&FBugo*hb_
zXJi8o(RF>v&j3;u*+<vZKSbA>YFf31`q!iiLW%QM;`@<eysc3GZX_aanoVt^bUh22
zC2jf_zOBvIOWWHfw)HG<V`FDpu}u=c8JW;cy@nsvO=9C|-?NEhUh;#$WJ%@*!K?|I
z&GU%~{PWh7&o<Jum5f&^Ni(!HM`zf$=6KDp(sI*A#W}FA>>NpqpBg_g?w!k3S#Q`R
zE$jJiV7!JKyIyKz6J|+j&RJs<&u!T$^O~PFm|d=wot1X!WcS9Z866uR9h+b6*|RpT
zj;!43+27SZ9Wm>_y~J+H5|Ir8%i118*H02RN=+86@6R#E>~!oBV!g8*b(Ui{u%YEA
znh+bF3p&fDvv}KHv#8i<##Ud6D_+Bfew6RE?U>1C7+T{8CMmmhUOH9I{x_y!6WGLf
z`L;VttVb?7%OoS4F;h){TBGP(O=D}g+i+VvB#YD5)9^JLa>u*pzwF<#GO=}W^S^$>
B2f_dV

delta 1171
zcmX}r%}bO~6vy#1IpbuLrZ!ob<zqT(nd#_gHkLvrK~&OC2#R2&G!ondK{)jXL`{P&
zYUS42)PzLz0?k4SS5np@r-jU_RV`{+-`_Jg4|AW-y_e_Z-gE9`y1sX$3$?*HBYJ5K
zv=;%hQ+TF~3vo4QR)>>#1aIRIzI6V<e#ZSFv(0!N_u&oHb8}dWPu=(()-ztk9<#Ll
zq@xE~%FUuUg2!<j8}T9Xvqdi4YH!>)j{}T9;vklV%?{%*R^l{v;w{w17ElXX!tGeV
z1mCw`bf%bSWBK~v1JpvEJC~53edD4J6j2L_R+zDQtH+brh!-)1x<8M++Lqn;6Y9A&
zH@}VvzHdM1)S$Pe^gs{tvm_V2XcQ0PIn)Pl;yubVi`r4u*3trEc%JbTp1{|r%=~rZ
zLDI6H@hmpsJf>BPJe{3bz`ghz$1qxDb_`QEg7Y|zMQp{PZDs)$GJ)*Du2h@RwHefN
zcQA!-u>+gg<qjOfKAfl_|7~<0Gocmb@d*}DDa~+l?&2!y1t|*W;eFJ?pP@3ej7j{A
z5v-<uI=>Bg8a?MVBpJ4dDn&j@{`G<nZeqpV@D+!dFQU#wjAg5qqsZFqtn(7;5YAu%
z7m$S5AsXk>FPk#+KXlObK9x-o=KCAbPLIEYe_DGtW=n@oyHY3%3S})$V|{+Gaoa=d
zq^UH@&H);g^v}{JRP7bYbQet<x!lafqpAKe+HM-<_0IuW_v;CMI$P8sc9rl`$%g&V
z!Blk9lu=6VM<_cPY!6IlGr_vth0s8GIPS%dCi}Xxk0MR3AJ4syv<7ltDqmIn1LPfL
Ac>n+a

diff --git a/cas_server/locale/fr/LC_MESSAGES/django.po b/cas_server/locale/fr/LC_MESSAGES/django.po
index 6feb336..1f0f613 100644
--- a/cas_server/locale/fr/LC_MESSAGES/django.po
+++ b/cas_server/locale/fr/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cas_server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-11 19:50+0100\n"
-"PO-Revision-Date: 2015-12-11 19:51+0100\n"
+"POT-Creation-Date: 2015-12-12 18:18+0100\n"
+"PO-Revision-Date: 2015-12-12 18:20+0100\n"
 "Last-Translator: Valentin Samir <valentin.samir@crans.org>\n"
 "Language-Team: django <LL@li.org>\n"
 "Language: fr\n"
@@ -46,76 +46,87 @@ msgstr "Nettoyer les sessions supprimées"
 msgid "Clean old trickets"
 msgstr "Nettoyer les vieux tickets"
 
-#: models.py:88
+#: models.py:90
 #, python-format
 msgid "Error during service logout %s"
 msgstr "Une erreur est survenue durant la déconnexion du service %s"
 
-#: models.py:158
+#: models.py:160
 msgid "position"
 msgstr "position"
 
-#: models.py:165 models.py:264
+#: models.py:167 models.py:271
 msgid "name"
 msgstr "nom"
 
-#: models.py:166
+#: models.py:168
 msgid "A name for the service"
 msgstr "Un nom pour le service"
 
-#: models.py:171 models.py:292 models.py:310
+#: models.py:173 models.py:299 models.py:317
 msgid "pattern"
 msgstr "motif"
 
-#: models.py:177
+#: models.py:175
+msgid ""
+"A regular expression matching services. Will usually looks like '^https://"
+"some\\.server\\.com/path/.*$'.As it is a regular expression, special "
+"character must be escaped with a '\\'."
+msgstr ""
+"Une expression rationnelle reconnaissant un service. Devrait généralement "
+"ressemblé à '^https://un\\.serveur\\.fr/chemin/.*$'. Comme il s'agit d'une "
+"expression rationnelle, les caractères spéciaux doivent être échappés avec "
+"un '\\'."
+
+#: models.py:184
 msgid "user field"
 msgstr "champ utilisateur"
 
-#: models.py:178
+#: models.py:185
 msgid "Name of the attribut to transmit as username, empty = login"
 msgstr ""
 "Nom de l'attribut devant être transmis comme nom d'utilisateur au service. "
 "vide = nom de connection"
 
-#: models.py:182
+#: models.py:189
 msgid "restrict username"
 msgstr "limiter les noms d'utilisateurs"
 
-#: models.py:183
+#: models.py:190
 msgid "Limit username allowed to connect to the list provided bellow"
 msgstr ""
 "Limiter les noms d'utilisateurs autorisé à se connecter à la liste fournie "
 "ci-dessous"
 
-#: models.py:187
+#: models.py:194
 msgid "proxy"
 msgstr "proxy"
 
-#: models.py:188
+#: models.py:195
 msgid "Proxy tickets can be delivered to the service"
 msgstr "des proxy tickets peuvent être délivrés au service"
 
-#: models.py:192
+#: models.py:199
 msgid "proxy callback"
 msgstr ""
 
-#: models.py:193
+#: models.py:200
 msgid "can be used as a proxy callback to deliver PGT"
 msgstr "peut être utilisé comme un callback pour recevoir un PGT"
 
-#: models.py:197
+#: models.py:204
 msgid "single log out"
 msgstr ""
 
-#: models.py:198
+#: models.py:205
 msgid "Enable SLO for the service"
 msgstr "Active le SLO pour le service"
 
-#: models.py:205
+#: models.py:212
 msgid "single log out callback"
 msgstr ""
 
-#: models.py:206
+#: models.py:213
 msgid ""
 "URL where the SLO request will be POST. empty = service url\n"
 "This is usefull for non HTTP proxied services."
@@ -124,55 +135,55 @@ msgstr ""
 "service\n"
 "Ceci n'est utilise que pour des services non HTTP proxifiés"
 
-#: models.py:249
+#: models.py:256
 msgid "username"
 msgstr "nom d'utilisateur"
 
-#: models.py:250
+#: models.py:257
 msgid "username allowed to connect to the service"
 msgstr "noms d'utilisateurs autorisé à se connecter au service"
 
-#: models.py:265
+#: models.py:272
 msgid "name of an attribut to send to the service, use * for all attributes"
 msgstr ""
 "nom d'un attribut a envoyer au service, utiliser * pour tous les attributs"
 
-#: models.py:270 models.py:316
+#: models.py:277 models.py:323
 msgid "replace"
 msgstr "remplacement"
 
-#: models.py:271
+#: models.py:278
 msgid ""
 "name under which the attribut will be showto the service. empty = default "
 "name of the attribut"
 msgstr ""
 "nom sous lequel l'attribut sera rendu visible au service. vide = inchangé"
 
-#: models.py:287 models.py:305
+#: models.py:294 models.py:312
 msgid "attribut"
 msgstr "attribut"
 
-#: models.py:288
+#: models.py:295
 msgid "Name of the attribut which must verify pattern"
 msgstr "Nom de l'attribut devant vérifier un motif"
 
-#: models.py:293
+#: models.py:300
 msgid "a regular expression"
 msgstr "une expression régulière"
 
-#: models.py:306
+#: models.py:313
 msgid "Name of the attribut for which the value must be replace"
 msgstr "nom de l'attribue pour lequel la valeur doit être remplacé"
 
-#: models.py:311
+#: models.py:318
 msgid "An regular expression maching whats need to be replaced"
 msgstr "une expression régulière reconnaissant ce qui doit être remplacé"
 
-#: models.py:317
+#: models.py:324
 msgid "replace expression, groups are capture by \\1, \\2 …"
 msgstr "expression de remplacement, les groupe sont capturé par \\1, \\2"
 
-#: models.py:407
+#: models.py:416
 #, python-format
 msgid ""
 "Error during service logout %(service)s:\n"
diff --git a/cas_server/migrations/0003_auto_20151212_1721.py b/cas_server/migrations/0003_auto_20151212_1721.py
new file mode 100644
index 0000000..22ac819
--- /dev/null
+++ b/cas_server/migrations/0003_auto_20151212_1721.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cas_server', '0002_auto_20151212_1300'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='servicepattern',
+            name='pattern',
+            field=models.CharField(help_text="A regular expression matching services. Will usually looks like '^https://some\\.server\\.com/path/.*$'.As it is a regular expression, special character must be escaped with a '\\'.", unique=True, max_length=255, verbose_name='pattern'),
+            preserve_default=True,
+        ),
+    ]
diff --git a/cas_server/models.py b/cas_server/models.py
index de3377f..8fa1488 100644
--- a/cas_server/models.py
+++ b/cas_server/models.py
@@ -170,7 +170,12 @@ class ServicePattern(models.Model):
     pattern = models.CharField(
         max_length=255,
         unique=True,
-        verbose_name=_(u"pattern")
+        verbose_name=_(u"pattern"),
+        help_text=_(
+            "A regular expression matching services. "
+            "Will usually looks like '^https://some\\.server\\.com/path/.*$'."
+            "As it is a regular expression, special character must be escaped with a '\\'."
+        )
     )
     user_field = models.CharField(
         max_length=255,