From e9b456ad6edbe28910b3955a0a261786ee96756a Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Tue, 13 Jan 2015 08:08:43 +0100 Subject: [PATCH] (re) Allow accents in names --- adminstuds.php | 4 ++-- app/inc/constants.php.template | 2 +- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 17711 -> 17771 bytes locale/en_GB/LC_MESSAGES/Studs.po | 3 +++ locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 19487 -> 19547 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 5 ++++- 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 0ec7333..ae70089 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -165,7 +165,7 @@ if (!empty($_POST['save'])) { // Save edition of an old vote $choices = $inputService->filterArray($_POST['choices'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => CHOICE_REGEX]]); if (empty($name)) { - $message = new Message('danger', _('Name is incorrect.')); + $message = new Message('danger', _('The name is invalid.')); } if (count($choices) != count($_POST['choices'])) { $message = new Message('danger', _('There is a problem with your choices.')); @@ -223,7 +223,7 @@ if (isset($_POST['add_comment'])) { $comment = strip_tags($_POST['comment']); if (empty($name)) { - $message = new Message('danger', _('Name is incorrect.')); + $message = new Message('danger', _('The name is invalid.')); } if ($message == null) { diff --git a/app/inc/constants.php.template b/app/inc/constants.php.template index 114203b..21fd6d6 100644 --- a/app/inc/constants.php.template +++ b/app/inc/constants.php.template @@ -58,7 +58,7 @@ $ALLOWED_LANGUAGES = [ // Regex const POLL_REGEX = '/^[a-z0-9]+$/'; const CHOICE_REGEX = '/^[012]$/'; -const NAME_REGEX = '/(*UTF8)^[[:alnum:]_ -]+$/i'; +const NAME_REGEX = '/^[áàâäãåçéèêëíìîïñóòôöõúùûüýÿæœa-z0-9_ -]+$/i'; // Path to logo const LOGOBANDEAU = ''; diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index d9bad6099c21fdf5cdca80a99bf14737a584d418..1586cb4a772491b97cc925a6cee57ce55cceabd1 100644 GIT binary patch delta 4184 zcmXxn4Nz899>?)>A3y@+d3ZpUm&f8kK=1_t)A9`!li6a`V%OE(Sxsdn#SGkN$<19K zqN3DZ9PTn^uF2L?85$|J6=dXUwrXr-lv-9c={P%1+q$mn=;XBDU-x*&Kc92Xz4zR6 z{^#8LjGgP9bL*YR7s=7BhT|kLl=yCtF?kO4M70{TD%qHB{0*+a(J96Z!%Y~(ZXAs7 zVr=nI1;%jSubluTcXykIKORPid> zDJx`{8eu7_!*W#WDr|ibDnm z!zri%-C^s?P_NS(+um&JTTugg3AHqPt^1MXHHWNUp*G=V)KY~>uQEFZHQ>m23QA?U zZTKl_S687rsz*I&18R@7q1Lt&`6QTqsOtw%9iFl0FJd0`*szz0LezC*QT^S5Of+JC zL4m=UI#kC`qB?G~cA?r2+WK)+rp}=T{=KaaW@G39VJyZH)LK`eGI%#?2^y?xu~6@S zGX?gC*@GLfAH%qScPa<}fb2)}XVl1hPSSD(Ticm{26$@|< zvfs@8sEM|sGQ0~TDjcAo&2bE)@C-5r^G__o0KH7aX;_B8Lw(_Ta4w#~NjQl{W#qT0 zew#23TTu_*hFofTunUS0@gO#JmzZ&M#FyN4Wd!mHlt)Ts8RL9Sumgrs743D8w zdK%-=H^v)yB5I(isOvJU!%-8w5tWhIsMmacghB#^TD%S)uqPfujrbX?#17O;uP|+jhHK5!K9UV0~m)I**w$@_o4>U zgi7txs3rLmDs#Q4>yMzWKa0xDCDcT|L){-7OO`Mnm9ZI^sQ15;f@ZYHo~TESxCxcI z$50Pw#YEhNTDxA`HPj1mCAMIe-v93@sH3cL-ml$o zTu!|mwIqJFyarNiEk(_!0`;K9xEQNZ4>*Y1u=pl#PxWIe^%JOpe~XOG47!>8D`gWY z=(W2I)nO$nb@OcfZcL%R3YGGQQTJ^`?dCSreJ`UAJ5l}Z#zyS6=O<6_+NY!XyLAHj z*N7I_hI-WN^eC#m#n!i@2DAsYG>5DoU>fz0t>2(FVGLg@E!AjLW+$NrT!zYIrLEsN zk^CpoP)mb4il82}3AIUfpw_krld%tV{V7z3=k0li&tD$(6jUZAqOO~Y>hE^cgqET{ zP-{^AJ`DXW>G&RMvz$T=Af?p%wF~2P>K|b<4w>rx+HFDIAD-s@ zh)qIeqz$!n?Wmb|-~zq>dnr`YkU8C3yGE>{{vv9I@nznPA=C`BQ7IjXTB2#FrI>>S zcqi($dlWU(c2tJ-Yj+uoFl&bQYj-=+WY(d+a7S=1UPM;IRNUfa zZT2OC8JLgT&6}v* zd>n`2m$uzk?(KCw2`hIuU{)*6Y-uK z^rtvS+&q82bI6_TpXPMBPxwQ5uW;@uB9}N$==g|eRKXtm-9CSo^QrrdKh5cLV*)uD zpK#`VViuuK)=6S0(czW_Le6e?VIb%Fcc>pEbSND<9w441{^o8Cq&XkEuhG{|>VGG$ z9X<;A#Eb6vK#p_FO-(9t9(T)=axy-obqb**={u(5uf$>Z!KBc_qm;D%D~T<{KZu3I zn}lA$4+tFt#A;#%v6awUq8(M`Nev=GY(9olSvaW5xjIbCi>FyDFAEenQ9_t08P zJV)r*Nc8+r;{Rdz6XFChme@}0Bi0f+K65t*bAtVpvI%y9d4cG4`+_+o?^4n(+eQ4C z(6NJfgP21+Mzj+;o+l2t*~z2gUZV6GvA65z$#MR!Md5kAgqr$rO>M)Hl{HJpbaf2t nNTYSOFMU>ZxVG+|aBY5d{e9t8OX|ZvTv4q{K96-9XLkM{=2Fl| delta 4120 zcmYk-3v|zA9LMqJx4G@&zx{VHv(07~%**Ey+ z#_Oo-Zdt=(jEOfUU>Z{h;Y1EL!cG{5{jmWS+4j*GNj-ptSdNU<{Akc!D8Ql~N#nCtim60o` zfy6Kh*$g$KHmC=6!(x00)&DwNjxnTHdul7{`dx|SUn4(6Lk?a*r7VeIYJ}OS4)ai{ z>tO4BQ5hP5O8IEieNUq{^9RDZAFRD8{zPYyKoPNbtcY>gUFfvpchy-rWs z_6fE=A2pyQsHNFptwfg9R9U}5ZNl@YrHUlI%4}2AfCCv6l)^mQa35+{_d|8`1nNPP zP_I=vYHgPzp9HfRb^Tschu_%qXE1~MpQubErFhq+qWa54?LYG%1qNq|Q5^?R9lvB< ziE7_w>-$le`VKYl-)#LRY9M|#NIOhLt#yA?1_z^-V3c(%X6yZ*NP+!fR^dFX#uV($ zJC%lIsMqsl)E=ooJ@|Xvg1=w^F6ZJ|coJvesC4hXUvLEVdZa^{D8;%s4*fjeOr$Uv z=imrDi(0c@{2PYjQ8PP&b@3c(W*1SZyoOquuom7DG{KhCTOs?*^hZr_94fQ(t*>K1 zo1&6JFjgbaHv6zG{)~5H0=;#?hcOcu;{dG24%moBWuy@GfT0+I<4_Ntgj{MCV>a%_ zR(L6s{42Hb)aqj{Dn%VJ6bn!T>xp^T7uio{Cf37MNcK$yY7ZSm?Tt&Q%mih5nTtd9 z+Y*(*Y+KLGBL9aSzSZ_bLxwko3!+gSPeEz#{X*dsup0fm9~L=kGOCtxAIfSPHIZ9j>c$z}B6HEUhgORsAT>i*WK zfpoU^K=m^SwIoAP6A3&=femk#pi;I2^=Uk4J%j4-1}e4T?YvEvf-IwHhwMM|DCz;z zP#w=krFu0+U&X4{9JoQK@|zwIt7=QnwT}lQpR8 zKSX8b5NaaFQ1@R%elAQf@2)b|6dPhTM(h3WXixM-jd&<3b;I%YYlFIBK5FfjqGq}U z{a9tsA3zPD29<$Y)ZX|TOR!F^_aj$^+Qi4P9?v&7C``eiJG@`HX{d}`Kn*0EtuNzI zGir`{P$w+LE~p2*iOVtkPH#_DU@Y}_Py;`JjK%zj%2@1OtiMK>K|vj6qf(b+>)kP$ zdM{MUi%~b0qIUCS)P1us2zbhY%R=>Efcii^g6el7s^2*QTX@x; z*ktR~sLUKjjr=EDzlwT5NJsBit_kY<(G!)y0jMP?vW`N&MP@7};4++tRhWW-`#X8R zaw9RGhPkLsvJ&;+qqqf6V*xJi?ET6e!x_|z?(yzBjU%YvLSt@Zb)nVmtU@)Bxkg1dN25QX|tNkzSGJyA0(L8W%4bqQ)u ztVexEs!&U|3)|}bKShD%Gtu{XzjD1Xllnp&pc{~^8(&v1BM+e-Fc9??l%O6w9yOqa zsFZKVR(KYbS${WgX|hlm%Ei#(6!IwqV^`!AHr-L1<$2UDeic)3g>C-`wKvY7GV>QI zbH4k%j+0RtOt^>Edmh=JjeS{9>K*w{$0;1a85E17bcK6X&1@(`K|BfIEEr`{w6Pe~5aWf*@I?LRL zBh%u)q?NsTJ2U!d>3E0O@4gh7Fyt#rZHZE1De*ZmgxF3fr(X~{4iV1~V+d{k#)KAe z7g0s5C0-^*5jwQPR=6SlWXHIf{ua(Ax6q%^xsuj0o#uFvC?|HP!of$_^dycEImBDU zZej|d<6C#FKh1xTQZs@jHmivD-4p(__IoL5YrRc$Cv>bQwh?`Z*~Cgh$D725Zu_XL jkTsOH5<4qLM1}aAl*+P{fkBlusc*#nS3ciqdV_xfYu>=Z diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po index f6f1e22..042f7a5 100644 --- a/locale/en_GB/LC_MESSAGES/Studs.po +++ b/locale/en_GB/LC_MESSAGES/Studs.po @@ -265,6 +265,9 @@ msgstr "Save the new rules" msgid "Cancel the rules edit" msgstr "Cancel the rules edit" +msgid "The name is invalid." +msgstr "Le nom n'est pas valide." + # Help text adminstuds.php msgid "As poll administrator, you can change all the lines of this poll with this button" msgstr "As poll administrator, you can change all the lines of this poll with this button" diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index f86ba55587cf71386ccab3ee11e58c17a0dbfe50..f3c7d063376b25d0656018a8819ca8818169e5cf 100644 GIT binary patch delta 4173 zcmXxn3shBA9>?*05JbT4<$?~6OM3N!5C#YqX^MhH4>T8!k8GBXX()r4T8#9t;g&W| zj*hxIQJRsY6V{|sU7ZJ*kFbZ1%wSUK=yI(ot<|)ev4@pRHS_&>wrBC@v(IZk{(J8u zZrSLZ+UP{iq{KEEj?+XI@qJ%oavaXD&{boWrWn(X_u@jlI@Oq=_%sHv9sA=^yb@1h zB7TeU7&E|_KA4Dl&Swo`hA|P7M@{U>`(h<9tBmj1cTUs8p#tl1YbewHt!-o<`e4=s0vf* zHG?(T=*Llb72blw@IF-in^5((U>xp4Kkb`C6i9{XK~2HGtx0rS9mqpiHLtKAR|Nq(@L|%1{j|UpS&>QN1?L9LM%)ZDfqp9FId^?VPi!gKci1@vDvH#T!VT)nRLv@e2m2n z7)Sf2iGoJB8E4^6oR5i296x3$zvki7s1f#J946&@BMhKAmWi68BGgoj!#tdftT%H% zYM@Q148MvI6%J9*;`jjj;5noZ=2I*}Kedd;@mPTmqP}n)I1SI?^>{rOm62trdRJfq zHlZ5cf;?(EumI0qMgH?Cr0`2AD#LiZ9hIUvn20r~jxE7!u^w4p<|XWlhmqMZ-Ke$n z6>5#74EHiK43)VtsCp-%GB{;8`PYTpxp2fG{n*ZVF5O#+AEGK=Q0VRR)u<6RAs;cb z6;*Kus^dqkJ@)!(R7XBXmX&cxr=}*1d}_?d2nD688r7q_Foboeihqkg$IYmb_M*OA z&IqqVX{c=)wvItHG!?a`mZ1-SgMNGp)zMbW#>g%Tdf_;dHFE)#!cejIzawP*XJ%$)=f&Nw^j@MH^95(}Df)9aKZdP`l$()GqiDQ!(orO(F9?f&yFC+=^=O z9#jPp)W{!4HLxAENROa0br$uUpW*Ahbkr`&N2PcavQtetCSWbD#(VKO{4Zu||36de zrDzYfalRKH#zoiJZHVfzf0UPrFlzOWMm2N?w&Gk|hW*&9&toHM?n9(g9W25DSb-C8 z21W)_*hE38Y(u5E15@w-CgO3_{yl@Ls25o#rvDgkWM$TyQQLG1s-Ee%9)E`F=)X|) zeTmBC4`ax`Qk*u{yHJY!qhP8r6Khe6W(B6Bi%R(p>mJne`%o3WhwNbUAJo8tWnRO@ zsQN~uo|}exZ*dv<*M(nmK`GsWYG^-Z;R#eGF4*h+#(60mVl72IKM@&}sX=A3#oph6 zYWN^(F`mW{er@j$jEwi@I3LwuHR^$TP!+GUZb$9k1E?wJMvdS@WF4A|s1z5Lds9+s zEk|Xn3M+6bYQRnS3`W{0rNM9ppA zTlpgbCm=i0>_S!eF>0HAhY1*8<#jNC>c~he!a1n-*5fRE8{=u;WKZ-`b2TP%UV<@L zhSRVdHIgQb#l1Kb4`L3UMSUL<>9tZn2(@TOp`M?Jaae87XQ0EmK6-A?73n#9Dd^Ci zzI^=YasgKmZ@U3ss`FPj$Cv9Ic5m~IciPUv?|}LFYAhwm*F30nXndbm*(1;~`=l@rK*% zPjlXL_fXeP&fg&}A4**=vEBW`A9g-)2PPLeYu(D^aKZS~|Brbm{8+!f12Ff`n-7#GvzkD_Yka delta 4120 zcmYk-2UM0-9LMqd2%-$%mlr`mK#`Z>A_T&6C9cY>3{5L@H5{2)G_=y=>v5%7hCQe7 z0kD4B$G9!8b7t>o5wBVG}%sVR#1h z-g#?uyfMkfgiI2JNFEem3+#^3I2fDaD0_cA#!?Sq36>#aHAn6JA2FQz8T8==t1rQr zMCxg%?~73FUx_jFZw66NL!&SS$D(F36WiePNL%J@=RY5++LUjyrk>R>2pAY)OforYSH8K{}9 zM7>{$dVdcpGlx+V`3m*@9~f#$Av(!RSvG3fi%>J_WAERD8u3`v8csxY@CfStXOOX) zm8h9kqxMFPeZCJhfUi**_#U-4!jsAWT@+%N{zRONt??UFLt%_=I!57moR7-LDbzsX z8HH?vn$abwj{4$g?2l@H9j?H5(yKkS8TJ15RPwKp@8d=R{)9?d8pG5Gb5RWzp;Fh? z)(4_8bR#O|<5Ax|h}z7vQQs}ZM(Cp2dlqNla{Ih>sFn916V+fx)PRa@{U+3Ly4&8L zZ0k>=2DBKpG#ji{$g-Mk)_T+?{1LTOv7}d-ZG{?eD2swpSY&VXM(yfBsD|!9bu<-q ztjbVpy8`)1Fq=^C??N?rz&`&Dv#9@t%0yba_g)67y+YLfGgnh!aAq{B;Sj3fMb=fQ z`&(?i4wb3TQ3LCp$a+-AU*fCyGZy0tUY?6z;cOh2>3#Pzj-ehwI+Tft*ceMOK>ub6h2c0K z$KdyxDzG9hT#bSc6@$1vizE5>y8xF%nBr9ZyAGHRYI#JFz{U zY)Af;+GJ`?un?7^ZWx8dsDTZ@A{>b9Co=~la5a*BvmUjFK0@t{lc>xz>fmKA5!G&6 zR0eZxy|4rM-|g^Q&5ddvgfYBXxC7O2?@PS%Jq9(yQsl?WOh+wAIcnf*tsCwAt*C+2 zA=}9uL7k2Z$WM&%lU`-2V~B!A)DzROAFAQ8I1;CzX4-)I#X5q~cp7y)FIW@V^6DrL zby`Z$hj*YK??(-ECbA#RVm6EcZvD8om!Tvze$Rc^3I+ z_VPy)Igi>y;RW8n+oQhEM-8|)Y5>EKZ4fdc3hXmef!a*<7{Hi9Z^o@qYj-Jbu`jrznDSD8=!}i8QGgiG6TBUWd!^AoBm0ncSIgbp97nsKmuM4X?h; z9z)cKk7EK}K<)m7%e{_@a1Hey_z-@JFW@lFtk(W4YJkzCH6GKjHx{7Udk8~H$mkF|4QjpZm6Rrn2MWGnW(q-zeT0+oHgzW@BJKPGNu@n$!Vzf=AkCC3=?rHrsK!< z`ERIG5)ta@b=VR0LVwgiCRk^o&hJvx60AqfUTQD4FU@u+%B_fWH7)*F;`b@I6Q_x1mkXHtIGZR2b1>~@QM zInMj;2wzX<6?d60C2IrEbf7bdgM_Y6h#4x_>uvXlueEc?J?Bew_PPoFVDbT;>>-rg zyNJVt4%a%j#Gm49a_{j6)83+9OX$+-=z5e`NYuC+{E5zfx0bfnQ-6>6?^3>Uh&8Sg z8+01ntk^tfnL8vlnEWw!IsO-qVKnM`ji_@M#iop?r=-Q1NGu^fAVv^diHkW!UHb@a z=Ly8CL=vG~Zzr}96~xoTI6{|p*h)7t(AqI>yFiXp>6QdidQ@?Dk{)wCL6i~Is&I8C zSTOS`Q9!IEb`sMGU7xuXfneYxO4?j~iPgjo_eda^zl&0PVk2=Cq3dO03voR$k61S(W#k=!UAkmCFczEaQe diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index c06c789..551705d 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -265,6 +265,9 @@ msgstr "Enregistrer les nouvelles permissions" msgid "Cancel the rules edit" msgstr "Annuler le changement de permissions" +msgid "The name is invalid." +msgstr "Le nom n'est pas valide." + # Help text adminstuds.php msgid "As poll administrator, you can change all the lines of this poll with this button" msgstr "En tant qu'administrateur, vous pouvez modifier toutes les lignes de ce sondage avec ce bouton" @@ -670,7 +673,7 @@ msgid "" "has filled a line.\n" "You can find your poll at the link" msgstr "" -" vient de remplir une ligne.\n" +"vient de remplir une ligne.\n" "Vous pouvez retrouver votre sondage avec le lien suivant" msgid "Thanks for your confidence."