From b45f8df09e1dd763576c2b116ef282f96e4bb81c Mon Sep 17 00:00:00 2001 From: Valentin Samir Date: Sat, 30 Jul 2016 01:31:43 +0200 Subject: [PATCH] Remove english "translation" and use full english text in the sources. Update french translation. --- cas_server/forms.py | 16 +- cas_server/locale/en/LC_MESSAGES/django.mo | Bin 6105 -> 0 bytes cas_server/locale/en/LC_MESSAGES/django.po | 371 -------------------- cas_server/locale/fr/LC_MESSAGES/django.mo | Bin 8496 -> 9574 bytes cas_server/locale/fr/LC_MESSAGES/django.po | 243 +++++++------ cas_server/models.py | 16 +- cas_server/templates/cas_server/logged.html | 2 +- cas_server/tests/test_view.py | 6 +- cas_server/views.py | 10 +- 9 files changed, 169 insertions(+), 495 deletions(-) delete mode 100644 cas_server/locale/en/LC_MESSAGES/django.mo delete mode 100644 cas_server/locale/en/LC_MESSAGES/django.po diff --git a/cas_server/forms.py b/cas_server/forms.py index 2f18ed9..2e554bb 100644 --- a/cas_server/forms.py +++ b/cas_server/forms.py @@ -82,7 +82,10 @@ class FederateSelect(BootsrapForm): #: A checkbox to remember the user choices of :attr:`provider` remember = forms.BooleanField(label=_('Remember the identity provider'), required=False) #: A checkbox to ask to be warn before emiting a ticket for another service - warn = forms.BooleanField(label=_('warn'), required=False) + warn = forms.BooleanField( + label=_('Warn me before logging me into other sites.'), + required=False + ) #: Is the service asking the authentication renewal ? renew = forms.BooleanField(widget=forms.HiddenInput(), required=False) @@ -94,7 +97,7 @@ class UserCredential(BootsrapForm): Form used on the login page to retrive user credentials """ #: The user username - username = forms.CharField(label=_('login')) + username = forms.CharField(label=_('username')) #: The service url for which the user want a ticket service = forms.CharField(label=_('service'), widget=forms.HiddenInput(), required=False) #: The user password @@ -103,7 +106,10 @@ class UserCredential(BootsrapForm): lt = forms.CharField(widget=forms.HiddenInput(), required=False) method = forms.CharField(widget=forms.HiddenInput(), required=False) #: A checkbox to ask to be warn before emiting a ticket for another service - warn = forms.BooleanField(label=_('warn'), required=False) + warn = forms.BooleanField( + label=_('Warn me before logging me into other sites.'), + required=False + ) #: Is the service asking the authentication renewal ? renew = forms.BooleanField(widget=forms.HiddenInput(), required=False) @@ -124,7 +130,9 @@ class UserCredential(BootsrapForm): if auth.test_password(cleaned_data.get("password")): cleaned_data["username"] = auth.username else: - raise forms.ValidationError(_(u"Bad user")) + raise forms.ValidationError( + _(u"The credentials you provided cannot be determined to be authentic.") + ) return cleaned_data diff --git a/cas_server/locale/en/LC_MESSAGES/django.mo b/cas_server/locale/en/LC_MESSAGES/django.mo deleted file mode 100644 index 8a9dda44316919636e9d665a5eb9f42f8da97fcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6105 zcmeI0OKc=Z8GwrrLSi0)gzzR?3+vds@w6YiSsTZ;;@$PGEWE7oItdSJp{Bb$)7hTx zNmaLJ4FQD%3Q{=00Y&1HTtFNUFF_iBd*7X3S6s8S_tSp;I;B?OS6P7ei_*M9^Hz@Tyyb0e4 z)4P=VA^Z}QIp*G|)DrC0{2n~Z{a@hSaFm}1VE|?PW%wQ#!TaDB>gQjB@8$m6Q2PG@ zz8&6#?|`qsMR?CWN*#ljAR?$1L^PGw_c@&7{&VnA_#+s=zrwe`Vap-&AoNB9dB!GXF&=@)l6^dJc+Q-+-7>y#z17Z^CQv zPf*6MzF8?ur8c14e-g^L5WW@0_4^x8SfOe!Bq0Z=Z)^*PlS~+aIC$?H^FSbK-%@ zZ|9-N_ZcXD>%lYdIVj)zDP)NHP0hbSvGZLFlKJn2BJUDJM70j(eF(+A2^7CQ4X?qM z>-P`5tMc1}Q2IXvMW0EC>D43k`wLLyS%c!YFTx4<9f;c$VL7;PiF$}esFkvO0G_6e z(j-Ru*CX{G?}IX@T%yAmO?1A4CbFEMou!?m4PVpTNX%;*VWTE#Gc@so$S&7$8X>CQ zO%uQOFVR)(KUF^v8_6|G6TQZ15)a}F@jq@>sH*DpqCUjmVh_2*uj11W%1wRYp3*Pk zGfb`2Li_a6TGq;nT>Bynt@qnSvM|ZhPh^E|n;kp!JlWMr)@s>EOaE<`b@Zs$ov`*f+m`QtEKtunt4)Gd(Lr1N$7Na8sp(j~jX`B@3?>#<%UHElB*tOXuB*JG zJ0=g?aoXzl@_~LbP7+=C!X%|*v+G_b@pY@muC?>L>*psYeb%vCfy`^&RuE>L$*#%U zlfkJIW5Kf5cr5nX9P+sd?YlONiGr|goC$O5bf@sSZdz@9Xu8BuFV5Qx9@`oV)N*>r zB*(nwR&twW`yNL;Hq;83^w(-2SGTGBb?C9Uz?JKND$HiJFy&fMOFI;lc zpS*Rrv#ISN^J^Q8)cYg+wGKOHBFt``di9l}&L`HSIc?3U>1`WXXXK?! z=ZD_pE)K8ToJU!j+AtTp4Ts1|YMP1FSJ$o_h@KVah^L6}AQ1dbJwKnr7v8 zUA7bReYKkIm?Vy*Pn>GjJ0DhSafj#-vC0r7#Ij!HzHq-pNlaAKbKx#49Tgc#6WD_+ z!*JaZPga>m-jjs{aVo!bR3DY4P^Tc1V}PdQC{*dSn^*oTN}*l5MLA8xI1Q4 zWvgMAZPk`bhne_UlO?A*12cCF^%`v$MQvOJ!VDSDYWlC?;GQSKNeL@_sPnBULG1%{J zeKkpuvH*qxtpA?eMsK|7+gWe_(hCL=6xnT4Bzcv?ZwXx0HQx6!7x70GI^E32vX83L z7S->-BB~$DHHQ-agl@U4=wd~7CK7L6K(gZ2^n~7;(Kny{mO{sWwMzTW?iq<~V>sK}#=h+xViN*!8*1VpX znm*f@nr%#-(bKc@r_Vk-H8V9u$Hs=;iDlly`+d0Tw`P3a*px+@m^^dy`U#WBs-V;` zo!IFGmV0?0c)5Qpl&(SMT1z8qCT$g_WgDB;bmn#R6!)24SX+B6iTC%I*ESuwyn1YQZ|F(axhS`0fy|o zk~U1@N=_YiyDqoz<9d%1q*FgW>Qm;Os z>Q&PEzi~i~(|X%|^%^@^Xu8Rz!%w8Owv?Cp3ZI#@aEkjnngi9 VM}+d=S!R!ng8=`jigW7&^-nj7FsT3l diff --git a/cas_server/locale/en/LC_MESSAGES/django.po b/cas_server/locale/en/LC_MESSAGES/django.po deleted file mode 100644 index 6d4de34..0000000 --- a/cas_server/locale/en/LC_MESSAGES/django.po +++ /dev/null @@ -1,371 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: cas_server\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-07-04 17:36+0200\n" -"PO-Revision-Date: 2016-07-04 17:39+0200\n" -"Last-Translator: Valentin Samir \n" -"Language-Team: django \n" -"Language: en\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.8\n" - -#: apps.py:19 templates/cas_server/base.html:3 -#: templates/cas_server/base.html:20 -msgid "Central Authentication Service" -msgstr "Central Authentication Service" - -#: forms.py:43 -msgid "Identity provider" -msgstr "Identity provider" - -#: forms.py:45 forms.py:55 forms.py:106 -msgid "service" -msgstr "" - -#: forms.py:47 -msgid "Remember the identity provider" -msgstr "Remember the identity provider" - -#: forms.py:48 forms.py:59 -msgid "warn" -msgstr " Warn me before logging me into other sites." - -#: forms.py:54 -msgid "login" -msgstr "username" - -#: forms.py:56 -msgid "password" -msgstr "password" - -#: forms.py:71 -msgid "Bad user" -msgstr "The credentials you provided cannot be determined to be authentic." - -#: forms.py:96 -msgid "User not found in the temporary database, please try to reconnect" -msgstr "" - -#: management/commands/cas_clean_federate.py:20 -msgid "Clean old federated users" -msgstr "Clean old federated users" - -#: management/commands/cas_clean_sessions.py:22 -msgid "Clean deleted sessions" -msgstr "Clean deleted sessions" - -#: management/commands/cas_clean_tickets.py:22 -msgid "Clean old trickets" -msgstr "Clean old trickets" - -#: models.py:42 -msgid "identity provider" -msgstr "identity provider" - -#: models.py:43 -msgid "identity providers" -msgstr "identity providers" - -#: models.py:47 -msgid "suffix" -msgstr "" - -#: models.py:48 -msgid "" -"Suffix append to backend CAS returner username: `returned_username`@`suffix`" -msgstr "" - -#: models.py:50 -msgid "server url" -msgstr "" - -#: models.py:59 -msgid "CAS protocol version" -msgstr "" - -#: models.py:60 -msgid "" -"Version of the CAS protocol to use when sending requests the the backend CAS" -msgstr "" - -#: models.py:65 -msgid "verbose name" -msgstr "" - -#: models.py:66 -msgid "Name for this identity provider displayed on the login page" -msgstr "" - -#: models.py:70 models.py:317 -msgid "position" -msgstr "position" - -#: models.py:80 -msgid "display" -msgstr "" - -#: models.py:81 -msgid "Display the provider on the login page" -msgstr "" - -#: models.py:164 -msgid "User" -msgstr "" - -#: models.py:165 -msgid "Users" -msgstr "" - -#: models.py:234 -#, python-format -msgid "Error during service logout %s" -msgstr "Error during service logout %s" - -#: models.py:312 -msgid "Service pattern" -msgstr "Service pattern" - -#: models.py:313 -msgid "Services patterns" -msgstr "" - -#: models.py:318 -msgid "service patterns are sorted using the position attribute" -msgstr "" - -#: models.py:325 models.py:449 -msgid "name" -msgstr "name" - -#: models.py:326 -msgid "A name for the service" -msgstr "A name for the service" - -#: models.py:331 models.py:478 models.py:497 -msgid "pattern" -msgstr "pattern" - -#: models.py:333 -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 "" -"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 '\\'." - -#: models.py:342 -msgid "user field" -msgstr "" - -#: models.py:343 -msgid "Name of the attribut to transmit as username, empty = login" -msgstr "Name of the attribut to transmit as username, empty = login" - -#: models.py:347 -msgid "restrict username" -msgstr "" - -#: models.py:348 -msgid "Limit username allowed to connect to the list provided bellow" -msgstr "Limit username allowed to connect to the list provided bellow" - -#: models.py:352 -msgid "proxy" -msgstr "proxy" - -#: models.py:353 -msgid "Proxy tickets can be delivered to the service" -msgstr "Proxy tickets can be delivered to the service" - -#: models.py:357 -msgid "proxy callback" -msgstr "proxy callback" - -#: models.py:358 -msgid "can be used as a proxy callback to deliver PGT" -msgstr "can be used as a proxy callback to deliver PGT" - -#: models.py:362 -msgid "single log out" -msgstr "" - -#: models.py:363 -msgid "Enable SLO for the service" -msgstr "Enable SLO for the service" - -#: models.py:370 -msgid "single log out callback" -msgstr "" - -#: models.py:371 -msgid "" -"URL where the SLO request will be POST. empty = service url\n" -"This is usefull for non HTTP proxied services." -msgstr "" - -#: models.py:433 -msgid "username" -msgstr "" - -#: models.py:434 -msgid "username allowed to connect to the service" -msgstr "username allowed to connect to the service" - -#: models.py:450 -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:455 models.py:503 -msgid "replace" -msgstr "replace" - -#: models.py:456 -msgid "" -"name under which the attribut will be showto the service. empty = default " -"name of the attribut" -msgstr "" -"name under which the attribut will be showto the service. empty = default " -"name of the attribut" - -#: models.py:473 models.py:492 -msgid "attribut" -msgstr "attribut" - -#: models.py:474 -msgid "Name of the attribut which must verify pattern" -msgstr "Name of the attribut which must verify pattern" - -#: models.py:479 -msgid "a regular expression" -msgstr "a regular expression" - -#: models.py:493 -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:498 -msgid "An regular expression maching whats need to be replaced" -msgstr "An regular expression maching whats need to be replaced" - -#: models.py:504 -msgid "replace expression, groups are capture by \\1, \\2 …" -msgstr "replace expression, groups are capture by \\1, \\2 …" - -#: templates/cas_server/logged.html:6 -msgid "Logged" -msgstr "" -"

Log In Successful

You have successfully logged into the Central " -"Authentication Service.
For security reasons, please Log Out and Exit " -"your web browser when you are done accessing services that require " -"authentication!" - -#: templates/cas_server/logged.html:10 -msgid "Log me out from all my sessions" -msgstr "Log me out from all my sessions" - -#: templates/cas_server/logged.html:13 -msgid "Logout" -msgstr "Logout" - -#: templates/cas_server/login.html:8 -msgid "Please log in" -msgstr "Please log in" - -#: templates/cas_server/login.html:13 -msgid "Login" -msgstr "Login" - -#: templates/cas_server/warn.html:10 -msgid "Connect to the service" -msgstr "Connect to the service" - -#: views.py:152 -msgid "" -"

Logout successful

You have successfully logged out from the Central " -"Authentication Service. For security reasons, exit your web browser." -msgstr "" -"

Logout successful

You have successfully logged out from the Central " -"Authentication Service. For security reasons, exit your web browser." - -#: views.py:158 -#, python-format -msgid "" -"

Logout successful

You have successfully logged out from %s sessions " -"of the Central Authentication Service. For security reasons, exit your web " -"browser." -msgstr "" -"

Logout successful

You have successfully logged out from %s sessions " -"of the Central Authentication Service. For security reasons, exit your web " -"browser." - -#: views.py:165 -msgid "" -"

Logout successful

You were already logged out from the Central " -"Authentication Service. For security reasons, exit your web browser." -msgstr "" -"

Logout successful

You were already logged out from the Central " -"Authentication Service. For security reasons, exit your web browser." - -#: views.py:349 -msgid "Invalid login ticket" -msgstr "Invalid login ticket, please retry to login" - -#: views.py:470 -#, python-format -msgid "Authentication has been required by service %(name)s (%(url)s)" -msgstr "Authentication has been required by service %(name)s (%(url)s)" - -#: views.py:508 -#, python-format -msgid "Service %(url)s non allowed." -msgstr "Service %(url)s non allowed." - -#: views.py:515 -msgid "Username non allowed" -msgstr "Username non allowed" - -#: views.py:522 -msgid "User charateristics non allowed" -msgstr "User charateristics non allowed" - -#: views.py:529 -#, python-format -msgid "The attribut %(field)s is needed to use that service" -msgstr "The attribut %(field)s is needed to use that service" - -#: views.py:599 -#, python-format -msgid "Authentication renewal required by service %(name)s (%(url)s)." -msgstr "Authentication renewal required by service %(name)s (%(url)s)." - -#: views.py:606 -#, python-format -msgid "Authentication required by service %(name)s (%(url)s)." -msgstr "Authentication required by service %(name)s (%(url)s)." - -#: views.py:613 -#, python-format -msgid "Service %s non allowed" -msgstr "Service %s non allowed" - -#~ msgid "" -#~ "Error during service logout %(service)s:\n" -#~ "%(error)s" -#~ msgstr "" -#~ "Error during service logout %(service)s:\n" -#~ "%(error)s" - -#~ msgid "Successfully logout" -#~ msgstr "" -#~ "

Logout successful

You have successfully logged out of the Central " -#~ "Authentication Service.
For security reasons, exit your web browser." diff --git a/cas_server/locale/fr/LC_MESSAGES/django.mo b/cas_server/locale/fr/LC_MESSAGES/django.mo index cd54e7aeb82557f437c101613f1562769afc3463..6d5f83a00e705097d3b638b3b6e59b2e00407cd4 100644 GIT binary patch delta 2846 zcmZXUTWl3Y7{}*eZ&FHumRqSXm1_YHmqNLr3CfF z#3+V%i5p*xmuQFqA$U2#7&Q^ChQuh*7ZV@!!5GvRB;FEG6Mx^HZ6P{2v%i_ynb~jt z-+#`VTQBX%e>bhNWwC54J#2>V7BzkHBj9G?YMIhTZTjxE7Z3ax2^f2jIg{#Qhm+zOOFRXoJ;L zB1zO9D3NC1PMC#qviIWmmmun@zhDxU@>Q~-)<6lMg@-7&3(AKqxE*HT0eA+IEj5Wr zd09A}h78;S<-?1hj4y|4;2OvpWkb@Zj>hjFgX`%(1x3;e@%xKV_WK4dh2KN6psH$6 zDM9++uk>H9MgMa&UYxGfYp@$VPr++Yq&+cHsk88Xco`1NQfeFAk3sgpm!L>{1#W^( z7=tOwg}1_EumPTiqTm;hpSsF}EmiFt^cRyXpTp_l0BnKBpiKA_w!?3s4I4=Oz3@0p zaFQROq~a2b$)dUf?|@A}f{#K8;3vpgRqec@HZ$MHA@~Or1^RUHOmTl z8F>=}tolpb+;jLowfLHTrKPYWD)Z$2 zj}^&x6IIesO6{PEq*YY$hMY!9V-eARgajaEEmeZX4$+IBr#l?o z9k!M&E3uux4X2bZC~fKWR%{MGDxWbhlr@%bv`p*D1=@1bdi#hS=p$~<(}zv3?)BWm zzMokN``Mg3` z*}I9nV-D+Khr8L@h1x<6|W@1 zvp1hhB*WB1E5BUFvUn!&j_APES+~!2REINcW$iR4^oLvr*)pCxSd@w#Icji34|(oz zw0(P9H=p2$C~(jOL{w}LbhJyP%0`Bb=eb^^r#kIHgwOdVyf|@vxTvyoW>W342FvS8hm{@O)(p&%Z0Lw5Da1=P-Ap?&%@uoadPIfw94!9=(NeKbOhaBRxGy zwNDfu->splajT4^JQE$l%KA~FXa@EGwYs1-7b=+xMS!kQOD-r%uli7*Q zywQ_lFW2^T#&&F-UW|=LPl+Eaj^|(Za@q`HF3TY$V)od~nK73(6uPF(pOAOl+_1@J z&A9i{9Cz`Jb~YF@ZHr;-$k6R32t>(kE-y^5$bngF7zHZ;p%(}l+{&3pE$u)}#(`Gj(YLd#~dK3kT-4@12SbFUQ6fnx4I3Jw31X0_#7CNFqQ>|EMKO&?gb!AY@qf0HhMPV6n>#ym z@11kc>@PdU+fqN4Wxpx3PNIg0&Jl^=Xf|K8V6Mm+Y{1uX5{I!TPhim+Cx#~fVc_k*~Feh4=)za;zjqh`oMUGPaP z!Lz6fnZTX+DQ?6H26-NLpeFMY>cZZ~$MAcc&-_yJ(98-OPzMO1KGAX1l)Z&(aRkY> zOrlQs9cregP@nKW)QPfL)ix}^XK@$mIOkFCpYZ!vFr_zs;{Wgk>dL=ConY=f0&7rj zT!EW#9cpS1`oG6fCpdzu@EDQ=8ADyr2YAvFxr&$Qcd_cTm|IT%&v9_Rd?uxPdF(s% zUDPKyP$BXZj$j+!$IRZ5f9)r5Ax>Z&euWR?pST+5SI*Q-EAo;3e1$QAi*dY?{OgG? z{R;{it(|^7?!$i6;=76#Pw*>JpYj`(N|NLrK8{&brjFBzQ9OaVfGK3nQduq1hym2` zdT|B5n&LoLd=bfxe2u!Nx9|}Dg_?;NmG>HsA@wO?mah|Z;9g9kjh~~Y{&(!hzmYXa z4;8FibQGKMgx^nn!~qX4H&9={o2V1~i&>aY$?m`+-@T|4jG)%e1=N8r`TZ;Y?;qo% zoS#HKQfiA(pVEL@ORdO4Qqtj{IEGqu!@h6hCi)jpGjbcXIR8O*Vz%id+Jb~$w}x0t ztS7XQfK09Ey}Gs9w5YX}==-nx_h5U(@94g1Yaz7Sb>G>IOgi<6I|=GE^Db-V<`7!# z+BAdu)YM^SpY=g>yR@w%mJ+Q*i1{;ZJKrk_eSNkNy64)oHaZAR^=4uN!ON2QLxS11 zj3Y`T^H-}U>j~Y~dD@|A$~FDk8i*%|twdN~n+Kcjd6>{D4G{cEWhz(q+$MMdGTWp@ zWcu=#n0RhgdNA*dl|EB&+RAT>MD3x3bgt=E3F`pH+)!2iM9Un^CeO`RfjtmUg zgD=?$Cy|K7-Gs?2?lNx_R~WZ=vw5#LY;G0bZS*o@xRF7p+3xn7FY;`t0rLKkT$+zO6e|*co-)WUMb1ag%AU{=Q}2scZZnvJM@r diff --git a/cas_server/locale/fr/LC_MESSAGES/django.po b/cas_server/locale/fr/LC_MESSAGES/django.po index 8a7e606..b57dcce 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: 2016-07-04 17:36+0200\n" -"PO-Revision-Date: 2016-07-04 17:37+0200\n" +"POT-Creation-Date: 2016-07-30 01:25+0200\n" +"PO-Revision-Date: 2016-07-30 01:30+0200\n" "Last-Translator: Valentin Samir \n" "Language-Team: django \n" "Language: fr\n" @@ -18,40 +18,40 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.8\n" -#: apps.py:19 templates/cas_server/base.html:3 -#: templates/cas_server/base.html:20 +#: apps.py:25 templates/cas_server/base.html:9 +#: templates/cas_server/base.html:27 msgid "Central Authentication Service" msgstr "Service Central d'Authentification" -#: forms.py:43 +#: forms.py:77 msgid "Identity provider" msgstr "fournisseur d'identité" -#: forms.py:45 forms.py:55 forms.py:106 +#: forms.py:80 forms.py:102 forms.py:205 msgid "service" msgstr "service" -#: forms.py:47 +#: forms.py:83 msgid "Remember the identity provider" msgstr "Se souvenir du fournisseur d'identité" -#: forms.py:48 forms.py:59 -msgid "warn" +#: forms.py:86 forms.py:109 +msgid "Warn me before logging me into other sites." msgstr "Prévenez-moi avant d'accéder à d'autres services." -#: forms.py:54 -msgid "login" -msgstr "Identifiant" +#: forms.py:100 models.py:600 +msgid "username" +msgstr "nom d'utilisateur" -#: forms.py:56 +#: forms.py:104 msgid "password" msgstr "mot de passe" -#: forms.py:71 -msgid "Bad user" +#: forms.py:131 +msgid "The credentials you provided cannot be determined to be authentic." msgstr "Les informations transmises n'ont pas permis de vous authentifier." -#: forms.py:96 +#: forms.py:191 msgid "User not found in the temporary database, please try to reconnect" msgstr "" "Utilisateur non trouvé dans la base de donnée temporaire, essayez de vous " @@ -69,98 +69,99 @@ msgstr "Nettoyer les sessions supprimées" msgid "Clean old trickets" msgstr "Nettoyer les vieux tickets" -#: models.py:42 +#: models.py:46 msgid "identity provider" msgstr "fournisseur d'identité" -#: models.py:43 +#: models.py:47 msgid "identity providers" msgstr "fournisseurs d'identités" -#: models.py:47 +#: models.py:53 msgid "suffix" msgstr "suffixe" -#: models.py:48 +#: models.py:55 msgid "" -"Suffix append to backend CAS returner username: `returned_username`@`suffix`" +"Suffix append to backend CAS returned username: ``returned_username`` @ " +"``suffix``." msgstr "" "Suffixe ajouté au nom d'utilisateur retourné par le CAS du fournisseur " -"d'identité : `nom retourné`@`suffixe`" +"d'identité : `nom retourné`@`suffixe`." -#: models.py:50 +#: models.py:62 msgid "server url" msgstr "url du serveur" -#: models.py:59 +#: models.py:72 msgid "CAS protocol version" msgstr "Version du protocole CAS" -#: models.py:60 +#: models.py:74 msgid "" -"Version of the CAS protocol to use when sending requests the the backend CAS" +"Version of the CAS protocol to use when sending requests the the backend CAS." msgstr "" "Version du protocole CAS à utiliser lorsque l'on envoie des requête au CAS " -"du fournisseur d'identité" +"du fournisseur d'identité." -#: models.py:65 +#: models.py:81 msgid "verbose name" msgstr "Nom du fournisseur" -#: models.py:66 -msgid "Name for this identity provider displayed on the login page" -msgstr "Nom affiché pour ce fournisseur d'identité sur la page de connexion" +#: models.py:82 +msgid "Name for this identity provider displayed on the login page." +msgstr "Nom affiché pour ce fournisseur d'identité sur la page de connexion." -#: models.py:70 models.py:317 +#: models.py:88 models.py:446 msgid "position" msgstr "position" -#: models.py:80 +#: models.py:102 msgid "display" msgstr "afficher" -#: models.py:81 -msgid "Display the provider on the login page" -msgstr "Afficher le fournisseur d'identité sur la page de connexion" +#: models.py:103 +msgid "Display the provider on the login page." +msgstr "Afficher le fournisseur d'identité sur la page de connexion." -#: models.py:164 +#: models.py:233 msgid "User" msgstr "Utilisateur" -#: models.py:165 +#: models.py:234 msgid "Users" msgstr "Utilisateurs" -#: models.py:234 +#: models.py:320 #, python-format msgid "Error during service logout %s" msgstr "Une erreur est survenue durant la déconnexion du service %s" -#: models.py:312 +#: models.py:440 msgid "Service pattern" msgstr "Motif de service" -#: models.py:313 +#: models.py:441 msgid "Services patterns" msgstr "Motifs de services" -#: models.py:318 +#: models.py:447 msgid "service patterns are sorted using the position attribute" msgstr "Les motifs de service sont trié selon l'attribut position" -#: models.py:325 models.py:449 +#: models.py:455 models.py:626 msgid "name" msgstr "nom" -#: models.py:326 +#: models.py:456 msgid "A name for the service" msgstr "Un nom pour le service" -#: models.py:331 models.py:478 models.py:497 +#: models.py:464 models.py:669 models.py:698 msgid "pattern" msgstr "motif" -#: models.py:333 +#: models.py:466 msgid "" "A regular expression matching services. Will usually looks like '^https://" "some\\.server\\.com/path/.*$'.As it is a regular expression, special " @@ -171,55 +172,55 @@ msgstr "" "expression rationnelle, les caractères spéciaux doivent être échappés avec " "un '\\'." -#: models.py:342 +#: models.py:476 msgid "user field" msgstr "champ utilisateur" -#: models.py:343 -msgid "Name of the attribut to transmit as username, empty = login" +#: models.py:477 +msgid "Name of the attribute to transmit as username, empty = login" msgstr "" "Nom de l'attribut devant être transmis comme nom d'utilisateur au service. " -"vide = nom de connection" +"vide = nom de connexion" -#: models.py:347 +#: models.py:482 msgid "restrict username" msgstr "limiter les noms d'utilisateurs" -#: models.py:348 +#: models.py:483 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:352 +#: models.py:488 msgid "proxy" msgstr "proxy" -#: models.py:353 +#: models.py:489 msgid "Proxy tickets can be delivered to the service" msgstr "des proxy tickets peuvent être délivrés au service" -#: models.py:357 +#: models.py:495 msgid "proxy callback" msgstr "" -#: models.py:358 +#: models.py:496 msgid "can be used as a proxy callback to deliver PGT" msgstr "peut être utilisé comme un callback pour recevoir un PGT" -#: models.py:362 +#: models.py:503 msgid "single log out" msgstr "" -#: models.py:363 +#: models.py:504 msgid "Enable SLO for the service" msgstr "Active le SLO pour le service" -#: models.py:370 +#: models.py:512 msgid "single log out callback" msgstr "" -#: models.py:371 +#: models.py:513 msgid "" "URL where the SLO request will be POST. empty = service url\n" "This is usefull for non HTTP proxied services." @@ -228,55 +229,62 @@ msgstr "" "service\n" "Ceci n'est utilise que pour des services non HTTP proxifiés" -#: models.py:433 -msgid "username" -msgstr "nom d'utilisateur" - -#: models.py:434 +#: models.py:601 msgid "username allowed to connect to the service" msgstr "noms d'utilisateurs autorisé à se connecter au service" -#: models.py:450 -msgid "name of an attribut to send to the service, use * for all attributes" +#: models.py:627 +msgid "name of an attribute 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:455 models.py:503 +#: models.py:634 models.py:705 msgid "replace" msgstr "remplacement" -#: models.py:456 +#: models.py:635 msgid "" -"name under which the attribut will be showto the service. empty = default " +"name under which the attribute 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:473 models.py:492 -msgid "attribut" +#: models.py:662 models.py:692 +msgid "attribute" msgstr "attribut" -#: models.py:474 -msgid "Name of the attribut which must verify pattern" +#: models.py:663 +msgid "Name of the attribute which must verify pattern" msgstr "Nom de l'attribut devant vérifier un motif" -#: models.py:479 +#: models.py:670 msgid "a regular expression" msgstr "une expression régulière" -#: models.py:493 -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:693 +msgid "Name of the attribute for which the value must be replace" +msgstr "nom de l'attribut pour lequel la valeur doit être remplacé" -#: models.py:498 +#: models.py:699 msgid "An regular expression maching whats need to be replaced" msgstr "une expression régulière reconnaissant ce qui doit être remplacé" -#: models.py:504 +#: models.py:706 msgid "replace expression, groups are capture by \\1, \\2 …" msgstr "expression de remplacement, les groupe sont capturé par \\1, \\2" -#: templates/cas_server/logged.html:6 +#: templates/cas_server/base.html:38 +#, python-format +msgid "" +"A new version of the application is available. This instance runs " +"%(VERSION)s and the last version is %(LAST_VERSION)s. Please consider " +"upgrading." +msgstr "" +"Une nouvelle version de l'application est disponible. Cette instance utilise " +"la version %(VERSION)s et la dernière version est %(LAST_VERSION)s. Merci de " +"vous mettre a jour." + +#: templates/cas_server/logged.html:4 msgid "Logged" msgstr "" "

Connexion réussie

Vous vous êtes authentifié(e) auprès du Service " @@ -284,27 +292,35 @@ msgstr "" "déconnecter et fermer votre navigateur lorsque vous avez fini d'accéder aux " "services authentifiés." -#: templates/cas_server/logged.html:10 -msgid "Log me out from all my sessions" -msgstr "Me déconnecter de toutes mes sessions" +#: templates/cas_server/logged.html:8 +msgid "" +"

Log In Successful

You have successfully logged into the Central " +"Authentication Service.
For security reasons, please Log Out and Exit " +"your web browser when you are done accessing services that require " +"authentication!" +msgstr "" +"

Déconnexion réussie

Vous vous êtes déconnecté(e) du Service Central " +"d'Authentification. Pour des raisons de sécurité, veuillez fermer votre " +"navigateur après avoir fini d'accéder a des services demandant une " +"authentification !" -#: templates/cas_server/logged.html:13 +#: templates/cas_server/logged.html:11 msgid "Logout" msgstr "Se déconnecter" -#: templates/cas_server/login.html:8 +#: templates/cas_server/login.html:6 msgid "Please log in" msgstr "Merci de se connecter" -#: templates/cas_server/login.html:13 +#: templates/cas_server/login.html:14 msgid "Login" msgstr "Connexion" -#: templates/cas_server/warn.html:10 +#: templates/cas_server/warn.html:9 msgid "Connect to the service" msgstr "Se connecter au service" -#: views.py:152 +#: views.py:165 msgid "" "

Logout successful

You have successfully logged out from the Central " "Authentication Service. For security reasons, exit your web browser." @@ -313,7 +329,7 @@ msgstr "" "d'Authentification. Pour des raisons de sécurité, veuillez fermer votre " "navigateur." -#: views.py:158 +#: views.py:171 #, python-format msgid "" "

Logout successful

You have successfully logged out from %s sessions " @@ -324,7 +340,7 @@ msgstr "" "Service Central d'Authentification. Pour des raisons de sécurité, veuillez " "fermer votre navigateur." -#: views.py:165 +#: views.py:178 msgid "" "

Logout successful

You were already logged out from the Central " "Authentication Service. For security reasons, exit your web browser." @@ -333,50 +349,71 @@ msgstr "" "d'Authentification. Pour des raisons de sécurité, veuillez fermer votre " "navigateur." -#: views.py:349 -msgid "Invalid login ticket" +#: views.py:351 +#, python-format +msgid "" +"Invalid response from your identity provider CAS upon ticket %(ticket)s " +"validation: %(error)r" +msgstr "" +"Réponse invalide du CAS du fournisseur d'identité lors de la validation du " +"ticket %(ticket)s: %(error)r" + +#: views.py:472 +msgid "Invalid login ticket, please retry to login" msgstr "Ticket de connexion invalide, merci de réessayé de vous connecter" -#: views.py:470 +#: views.py:652 #, python-format msgid "Authentication has been required by service %(name)s (%(url)s)" msgstr "" "Une demande d'authentification a été émise pour le service %(name)s " "(%(url)s)." -#: views.py:508 +#: views.py:690 #, python-format msgid "Service %(url)s non allowed." msgstr "le service %(url)s n'est pas autorisé." -#: views.py:515 +#: views.py:697 msgid "Username non allowed" msgstr "Nom d'utilisateur non authorisé" -#: views.py:522 -msgid "User charateristics non allowed" +#: views.py:704 +msgid "User characteristics non allowed" msgstr "Caractéristique utilisateur non autorisée" -#: views.py:529 +#: views.py:711 #, python-format -msgid "The attribut %(field)s is needed to use that service" +msgid "The attribute %(field)s is needed to use that service" msgstr "L'attribut %(field)s est nécessaire pour se connecter à ce service" -#: views.py:599 +#: views.py:801 #, python-format msgid "Authentication renewal required by service %(name)s (%(url)s)." msgstr "Demande de réauthentification pour le service %(name)s (%(url)s)." -#: views.py:606 +#: views.py:808 #, python-format msgid "Authentication required by service %(name)s (%(url)s)." msgstr "Authentification requise par le service %(name)s (%(url)s)." -#: views.py:613 +#: views.py:815 #, python-format msgid "Service %s non allowed" msgstr "Le service %s n'est pas autorisé" +#~ msgid "warn" +#~ msgstr "Prévenez-moi avant d'accéder à d'autres services." + +#~ msgid "login" +#~ msgstr "Identifiant" + +#~ msgid "Bad user" +#~ msgstr "Les informations transmises n'ont pas permis de vous authentifier." + +#~ msgid "Log me out from all my sessions" +#~ msgstr "Me déconnecter de toutes mes sessions" + #~ msgid "" #~ "Error during service logout %(service)s:\n" #~ "%(error)s" diff --git a/cas_server/models.py b/cas_server/models.py index 4626cce..dfedb1e 100644 --- a/cas_server/models.py +++ b/cas_server/models.py @@ -468,13 +468,13 @@ class ServicePattern(models.Model): "As it is a regular expression, special character must be escaped with a '\\'." ) ) - #: Name of the attribut to transmit as username, if empty the user login is used + #: Name of the attribute to transmit as username, if empty the user login is used user_field = models.CharField( max_length=255, default="", blank=True, verbose_name=_(u"user field"), - help_text=_("Name of the attribut to transmit as username, empty = login") + help_text=_("Name of the attribute to transmit as username, empty = login") ) #: A boolean allowing to limit username allowed to connect to :attr:`usernames`. restrict_users = models.BooleanField( @@ -624,7 +624,7 @@ class ReplaceAttributName(models.Model): name = models.CharField( max_length=255, verbose_name=_(u"name"), - help_text=_(u"name of an attribut to send to the service, use * for all attributes") + help_text=_(u"name of an attribute to send to the service, use * for all attributes") ) #: The name of the attribute to transmit to the service. If empty, the value of :attr:`name` #: is used. @@ -632,7 +632,7 @@ class ReplaceAttributName(models.Model): max_length=255, blank=True, verbose_name=_(u"replace"), - help_text=_(u"name under which the attribut will be show" + help_text=_(u"name under which the attribute will be show" u"to the service. empty = default name of the attribut") ) #: ForeignKey to a :class:`ServicePattern`. :class:`ReplaceAttributName` instances for a @@ -659,8 +659,8 @@ class FilterAttributValue(models.Model): #: The name of a user attribute attribut = models.CharField( max_length=255, - verbose_name=_(u"attribut"), - help_text=_(u"Name of the attribut which must verify pattern") + verbose_name=_(u"attribute"), + help_text=_(u"Name of the attribute which must verify pattern") ) #: A regular expression the attribute :attr:`attribut` value must verify. If :attr:`attribut` #: if a list, only one of the list values needs to match. @@ -689,8 +689,8 @@ class ReplaceAttributValue(models.Model): #: Name the attribute: a key of :attr:`User.attributs` attribut = models.CharField( max_length=255, - verbose_name=_(u"attribut"), - help_text=_(u"Name of the attribut for which the value must be replace") + verbose_name=_(u"attribute"), + help_text=_(u"Name of the attribute for which the value must be replace") ) #: A regular expression matching the part of the attribute value that need to be changed pattern = models.CharField( diff --git a/cas_server/templates/cas_server/logged.html b/cas_server/templates/cas_server/logged.html index f29445b..6e117aa 100644 --- a/cas_server/templates/cas_server/logged.html +++ b/cas_server/templates/cas_server/logged.html @@ -5,7 +5,7 @@