From 6fff5f107a806b6b004346b3592abdf516e8eac1 Mon Sep 17 00:00:00 2001
From: Olivier PEREZ <olivier@olivierperez.fr>
Date: Sun, 4 Jan 2015 01:36:55 +0100
Subject: [PATCH] Poll creation: Fix + Improve end date choice
---
choix_autre.php | 42 +++++++++++++++++++++---------
choix_date.php | 37 ++++++++++++++++----------
locale/de_DE/LC_MESSAGES/Studs.mo | Bin 17968 -> 17969 bytes
locale/de_DE/LC_MESSAGES/Studs.po | 2 +-
locale/en_GB/LC_MESSAGES/Studs.mo | Bin 17025 -> 17027 bytes
locale/en_GB/LC_MESSAGES/Studs.po | 4 +--
locale/es_ES/LC_MESSAGES/Studs.mo | Bin 16215 -> 16216 bytes
locale/es_ES/LC_MESSAGES/Studs.po | 2 +-
locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18813 -> 18765 bytes
locale/fr_FR/LC_MESSAGES/Studs.po | 4 +--
10 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/choix_autre.php b/choix_autre.php
index da3c4bc0..11e693ff 100644
--- a/choix_autre.php
+++ b/choix_autre.php
@@ -57,14 +57,32 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
// Step 4 : Data prepare before insert in DB
if (isset($_POST['confirmecreation'])) {
- $registredate = explode('/', $_POST['champdatefin']);
- if (is_array($registredate) == true && count($registredate) == 3) {
- $time = mktime(0, 0, 0, $registredate[1], $registredate[0], $registredate[2]);
- if ($time > time() + (24 * 60 * 60)) {
- $_SESSION['form']->champdatefin = $time;
+ // Define expiration date
+ $enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]);
+ $min_time = time() + (24 * 60 * 60);
+ $max_time = time() + (86400 * $config['default_poll_duration']);
+
+ if (!empty($enddate)) {
+ $registredate = explode('/', $enddate);
+
+ if (is_array($registredate) && count($registredate) == 3) {
+ $time = mktime(0, 0, 0, $registredate[1], $registredate[0], $registredate[2]);
+
+ if ($time < $min_time) {
+ $_SESSION['form']->end_date = $min_time;
+ } elseif ($max_time < $time) {
+ $_SESSION['form']->end_date = $max_time;
+ } else {
+ $_SESSION['form']->end_date = $time;
+ }
}
}
+ if (empty($_SESSION['form']->end_date)) {
+ // By default, expiration date is 6 months after last day
+ $_SESSION['form']->end_date = $max_time;
+ }
+
// format du sondage AUTRE
$_SESSION['form']->format = 'A';
@@ -156,7 +174,7 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
}
$summary .= '</ol>';
- $end_date_str = utf8_encode(strftime('%d/%M/%Y', $_SESSION['form']->end_date)); //textual date
+ $end_date_str = utf8_encode(strftime('%d/%m/%Y', $_SESSION['form']->end_date)); //textual date
echo '
<form name="formulaire" action="' . Utils::get_server_name() . 'choix_autre.php" method="POST" class="form-horizontal" role="form">
@@ -167,23 +185,23 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
' . $summary . '
</div>
<div class="alert alert-info">
- <p>' . _('Your poll will be automatically removed after') . ' ' . $config['default_poll_duration'] . ' ' . _('days') . '.<br />' . _("You can fix another removal date for it.") . '</p>
+ <p>' . _('Your poll will be automatically removed after') . ' ' . $config['default_poll_duration'] . ' ' . _('days') . '.<br />' . _('You can set a closer removal date for it.') . '</p>
<div class="form-group">
- <label for="champdatefin" class="col-sm-5 control-label">' . _('Removal date (optional)') . '</label>
+ <label for="enddate" class="col-sm-5 control-label">' . _('Removal date (optional)') . '</label>
<div class="col-sm-6">
<div class="input-group date">
<span class="input-group-addon"><i class="glyphicon glyphicon-calendar text-info"></i></span>
- <input type="text" class="form-control" id="champdatefin" data-date-format="' . _("dd/mm/yyyy") . '" aria-describedby="dateformat" name="champdatefin" value="' . $end_date_str . '" size="10" maxlength="10" placeholder="' . _("dd/mm/yyyy") . '" />
+ <input type="text" class="form-control" id="enddate" data-date-format="' . _('dd/mm/yyyy') . '" aria-describedby="dateformat" name="enddate" value="' . $end_date_str . '" size="10" maxlength="10" placeholder="' . _("dd/mm/yyyy") . '" />
</div>
</div>
- <span id="dateformat" class="sr-only">' . _("(dd/mm/yyyy)") . '</span>
+ <span id="dateformat" class="sr-only">' . _('(dd/mm/yyyy)') . '</span>
</div>
</div>
<div class="alert alert-warning">
- <p>' . _("Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.") . '</p>';
+ <p>' . _('Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.') . '</p>';
if ($config['use_smtp'] == true) {
echo '
- <p>' . _("Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.") . '</p>';
+ <p>' . _('Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.') . '</p>';
}
echo '
</div>
diff --git a/choix_date.php b/choix_date.php
index 623f5a54..6671def0 100644
--- a/choix_date.php
+++ b/choix_date.php
@@ -58,22 +58,29 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
if (!empty($_POST['confirmation'])) {
// Define expiration date
- if (!empty($_POST['champdatefin']))
- {
- $registredate = explode('/', $_POST['champdatefin']);
- if (is_array($registredate) && count($registredate) == 3)
- {
- $time = mktime(0,0,0, $registredate[1], $registredate[0], $registredate[2]);
- if ($time > time() + (24*60*60))
- {
- $_SESSION['form']->end_date=$time;
+ $enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]);
+ $min_time = time() + (24 * 60 * 60);
+ $max_time = time() + (86400 * $config['default_poll_duration']);
+
+ if (!empty($enddate)) {
+ $registredate = explode('/', $enddate);
+
+ if (is_array($registredate) && count($registredate) == 3) {
+ $time = mktime(0, 0, 0, $registredate[1], $registredate[0], $registredate[2]);
+
+ if ($time < $min_time) {
+ $_SESSION['form']->end_date = $min_time;
+ } elseif ($max_time < $time) {
+ $_SESSION['form']->end_date = $max_time;
+ } else {
+ $_SESSION['form']->end_date = $time;
}
}
}
- if(empty($_SESSION['form']->end_date)) {
+ if (empty($_SESSION['form']->end_date)) {
// By default, expiration date is 6 months after last day
- $_SESSION['form']->end_date=end($temp_results)+(86400 * $config['default_poll_duration']);
+ $_SESSION['form']->end_date = $max_time;
}
// Insert poll in database
@@ -165,6 +172,8 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
}
$summary .= '</ul>';
+ $end_date_str = utf8_encode(strftime('%d/%m/%Y', $_SESSION['form']->end_date)); //textual date
+
echo '
<form name="formulaire" action="' . Utils::get_server_name() . 'choix_date.php" method="POST" class="form-horizontal" role="form">
<div class="row" id="selected-days">
@@ -175,13 +184,13 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
'. $summary .'
</div>
<div class="alert alert-info clearfix">
- <p>' . _('Your poll will be automatically removed '). $config['default_poll_duration'] . ' ' . _("days") . ' ' ._('after the last date of your poll') . '.<br />' . _('You can fix another removal date for it.') .'</p>
+ <p>' . _('Your poll will be automatically removed '). $config['default_poll_duration'] . ' ' . _('days') . ' ' ._('after the last date of your poll') . '.<br />' . _('You can set a closer removal date for it.') .'</p>
<div class="form-group">
- <label for="champdatefin" class="col-sm-5 control-label">'. _('Removal date') .'</label>
+ <label for="enddate" class="col-sm-5 control-label">'. _('Removal date') .'</label>
<div class="col-sm-6">
<div class="input-group date">
<span class="input-group-addon"><i class="glyphicon glyphicon-calendar text-info"></i></span>
- <input type="text" class="form-control" id="champdatefin" data-date-format="'. _("dd/mm/yyyy") .'" aria-describedby="dateformat" name="champdatefin" value="'.strftime('%d/%m/%Y', $removal_date).'" size="10" maxlength="10" placeholder="'. _('dd/mm/yyyy') .'" />
+ <input type="text" class="form-control" id="enddate" data-date-format="'. _('dd/mm/yyyy') .'" aria-describedby="dateformat" name="enddate" value="'.$end_date_str.'" size="10" maxlength="10" placeholder="'. _('dd/mm/yyyy') .'" />
</div>
</div>
<span id="dateformat" class="sr-only">'. _("(dd/mm/yyyy)") .'</span>
diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo
index 99c35911ba21fa58ca59a9c594d971e7a9ecd8c7..b9acebd24cefe6b724c68f3955bc40c55ba42c46 100644
GIT binary patch
delta 1869
zcmXZcd2CKu7{~GF)y=ehyXbV+x9zm09cpRS($~IJbQ+>2h-6A51Th*aBDQM@5-CEX
z(liysA2dVCJ55v&iFN)WvHZc9*eYt5MrMRC-=BN``kZs_z2`jVInTN64ZhP2zV<&N
zoFX#|_A~nx7hyS`!&v-?eXv)5vmY=SGcg-SU=XXY9)HG5n2xV73L^^5qS23Gn1*H8
z7qhXt&>Z`T#wrE^cmR{|Py7*YU;;kGaD0mq*yHs-;ZvX4S8x0YQ7q&63yi^81Kf?w
z$1M8GQS<G>-q<q0abG;fKpF$>n2LX40X{|r6gAK+1v63am0%41f(m>NYT`9mgF8`y
zK1XHbHEIKq#b$9B<C)>m(1b;(g(jj>JsbVF!0WHTeEMsV%~~ra<26(U|3(Gy%`;(;
zJ6|p`WMxQFY#}O;J*fGdMjDFrENbT$F&FP4o45Zk2lEG;u?d@k3Sbo`Vhbvelc+Pk
zj0)&F#^Os<&HRh;m^8$#i9BT7u|YJH+Dg=fwWv(gd+x+I`YotbwxM=%1yv*OPyvMx
zb&IYT{q)OF&nKadaxSjKO}HQ5V;1Y%wi3>Tfg`vHk7FJ7FLg6<5Vey|&uge1-$tdf
z8yoN~F2(i3C|vA91%8T>*9I?m-a(eISD3~678veEJ{mRQWK`tSyzv^(#i*iNflBE*
zRNzgh?^<y?9z|WhLhfiZ4#6Z0qORQxOu;&I^ui8rU>|Cy$1wvtP=VY+P1uF1_BW^r
zVn>?si?BS@ca^B(or8K_i;1`v6~Hdk5gx)+JUf#7e_wzBeb9vo_yzTWf0WzLMfFQi
zA66j8ZZ)U{_hK40V;?+&+Q3z>{|M9R_jr9je>uIEQ%?RhaVZ1II2Bc;zo7#A9ktL_
zti%v%qOZ6a(}M0%G^0}6f%?(hMb@$&RA!1to1MUN9FNcN6c#vRNH>i;s0lWX<u{D2
zsFa6|bFXI%DwT=20rODr9mateIi3Q>Qd9=-VsCtos+o7FYxx<KslWs`<IV^gnqWFA
z^7WXB&8QT0c-}x=s|VN%yD<-6qpoAZM6-Dq#A<9pl4RYu1oJ2HbHm-Jd2S&YcI+P-
zinIq6z!#*xEMqc-gw;44+feuTF{<jLrnuD|hvD?oaT*4&5SL&s?!zJsp^o|?>S#Y;
zs<s+g;Z7JprMv*cu(+`^_PWnPTl_bDzEI=L_*CEd(9-z(Dbe+dR_D~_EL>h!AFAs2
GEc<`+jo2dq
delta 1868
zcmXZcduYvJ9LMqRu^ntXb7t7ttYfpyj2)NF3}^1QOsL7FWNx|5wTWE94@Iew+*)fw
z{y@2(6^fMG{I_!XhY6X?T}z0_`{Vbk)$8{>=lA<Q-{<>$pIxr;UE=SY-zhM&vV5}{
zxEP~&9Rv6cQ_<JkECIV>CicJ~7{w{L4*TLQ%)s~90pkgthyjel5Dvyn%)*KSb1a94
zY9@N%VeEo2?23(;g3TC@pU{tO-uNfJ_L=?h=3kM;3Vwf!NjSaG-N-x)GhT^`w--BN
zU7_Q?c#4U1CN5$KA7C$hiAtz_#4HWFquwjRB%F*&d=@J32Aqd`P>H@lRpbL|1O9$y
zoiNce!{I>z3s4J<L6v$YCgXf>yc+WuZ$vh0_1F#Xp(^+cmB3%mV1GAWHZo-;NKtGN
zDv^Dtc+No{l<8H}&TnE*e1dG=eqc7{4lrXAHXfBgHFm~2R3hh4XM7u#(0vTxJ5<kn
z#~`K-bbBHPnRl!o4=QarD&PWCCDwWF!A^|pP^CPJ+Q}VMk9<ZY6j$UnT?CUEm!N(h
zi#p2LSdH88Ab!Cx>)Wnk&X<W3xE)X9TFf8hR^ljXC)Yghp?3TbRmxVZ!B1F)TT193
zY(XV{o|e}JZ+JdJmaz92W_=5nx|x@u0**svKFOP}^jv~!y49$XZbl`31od4#?#7d-
z>(`q*nur6i3r11bZW^ZH8g%r+Zg1iMYNw~MJ2s#aX+i~TL3R5_RDh(RR0(rX-<6}9
zcNXgR1=txkq7vAPI>KWZ!mC56|NjM;&<8D;g1=E81ctfeY}B|2_2C5M*sT(^;C@WU
zT1>^us14lp#xF2~aho>|@Lx{vWkspK0v9vU4JV?ybS^5fRj7q_;$*yn3iJneV5rPJ
zids}@8&Lmf9wTd68>%vq;WRD|!_oK}FJPWC!t4wWk5B=&jx<|>^{A4!8|7ZlL{uqL
za4Y7Z-aC#F^pED;u^3gs$Ji0ypnB#r>RSFnRVqBjt+-Rlg91!NWxfS7u@+UL2G2&+
zwR(!}uoZLh1L`^k$C}N-C{D*CNRg}+mt*cYt|Hc;;xr)@cI-J1%CrrYz;C3#EMq)(
z7Avq6&!X<}OH|jlpWt?PGR8Ab$8ro~0WQOycmVt071U8TqmK3~hO|}xL^og<Rq{NH
t!^olQfkxkr*v{l8pU)0e1Vg@9tSb04En#WZrtF1l)~;V3o0{K}^$*_V*CYS{
diff --git a/locale/de_DE/LC_MESSAGES/Studs.po b/locale/de_DE/LC_MESSAGES/Studs.po
index e3ce8bd8..297e2810 100644
--- a/locale/de_DE/LC_MESSAGES/Studs.po
+++ b/locale/de_DE/LC_MESSAGES/Studs.po
@@ -567,7 +567,7 @@ msgstr "Löschdatum:"
msgid "Your poll will be automatically removed after 6 months."
msgstr "Ihre Umfrage wird automatisch nach 6 Monaten gelöscht."
-msgid "You can fix another removal date for it."
+msgid "You can set a closer removal date for it."
msgstr "Sie können jedoch auch ein anderes Löschdatum festlegen."
msgid "Removal date (optional)"
diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo
index 4a925240eb55e751961b7951af8188f35ca355a6..6410ad6b285b0e488bc39175cbeb21552a454087 100644
GIT binary patch
delta 1930
zcmZA2Sx8ku9LMoF+2T#FSIe?R&5}~PX<lv7R#PZ~Bosqh9?G=UXfeWGJVn_~MHU$q
z;!8v?r8g=IlM*b5pdB)(2O+Sc1&fx4>ig@=Q%|3nIWzzBpa0CccXz$Br{1}8b%2{;
zjA@x*Oc}ny8JL}BOf+u9Ay|t(JdC696sBVfW@0x^#7G85VlEECV(gDga4;^z2&}@X
zxIW#uW(<uc1_ojWj>9fY#$FtXkz^T<i5QC^RNz7!fD3HD7@s-Dl-lvMpfMYGo{5Uv
zh;euewZVr$*O(+4-3%zhAE?YDCV81gp(X~biKrcBpbv|1I2L0RR$?S>vEw^Y2_MH2
zY({Og&yN3cX=o==)G-EQtz$5Oeikage2m6&Yb7esR@9NyqBe38hheMrK5G4IR3$%Q
z03)*41iC|MaO`F_Dqtll&_+~g526+vL+!i?6S2+u0>{$tLnSh7vNu13N@O1D%*#<n
zupCvXI%K|U4$%lOZ~;|`YpAong$nQpWAH6%2j6Vpm+d7u0#%u0R02Wt;{w#tEJ1Co
z8g=$H_IW)f@qW`lV?7UAuo_2)%)d){0JZQU*5PGbhgmt^j!&ar+-B`UCHxe%kzQPh
zA5rla=TbdvL*0?3Q<%^DO$7~QT8qpz$1s3*QJ3)vDquIp;~U%mimJ#@R7w3)y>%l|
z^E0p?X5lUj+3{9X-0SEnKnD#a@D$a5hx!_R+i~ACub+ZSAc&e*fVv}PsLQ&{x(#)w
z4xx^s1y#uo)W*6{m3uLb`fH$vfmrNA1?oTDe($KW4`Cb@;1DcD&96eO-(jEc!}0VR
zQ5Cq2n%9X+{23--FDj0cNBz}^&+}f8hU({|cDM+Y=}Oz*gbKJDv+)G-MVU_2<@<t%
z(VuTj3ZB7KyovgHUSkgaK*bHZ{NA?G$io7BkNa@aOk?(97_~5O7Q4k#)Xr|8O5cvE
zOee0u=csu(v%Mo|#0vTysKm$3@z&*{E}@%GL!~K1mAV{N(lwZlJ5av|O{g8Vqbl^$
z`T=#ue^B4Kf39}~aX6X&bY!z;EzZMc)DKS&mg)QV7kGa<6{wP&N4?+@`mi1K;(Mrs
zdQc^gCfY=tfvQjy>Q=j`3hhT-;v=ZUP9yi(oW*2(i~~)PF`sGZm+8BGFsjfy`+QVo
ziczJjKn1QrmA=;Y>%zU!MUHc)Au}e`x!O<?^T09Tq`<j^!8KLeQ&y#{uHIY|?wk9@
N2{)%N{BQ7RzrQ&{+I|24
delta 1928
zcmY+_Z%EZw9LMqRwUvLm-D_sEWm*~8-L;!HE4}NVS|mg=xFk|Bn5Blb=pQwEQ2iR^
z)*mp+%8d;dgV-L0X4~wakRUxMh+07g772khHo`4x4;sBc{mzpfz0NtmbH2at`JVH;
z_h3ultCm3L#nE2G%(@EAYVaX0#Nt_ILEMa4*o^6T6m#(uYF#JBZ~&v2%HT&>f~i=I
zA7Bk;;94Ao4Y&ZCBIemt8XXLb!CoxDe$2;VoPenxn`L7zW?~!_xDrQWmFrjIy?|NL
zjTaWN37*eJ#cjv&cp0_9TScB(9*qG8l;JB><|(uNOfyguL(W{(4kMV3%kV?2#<5tB
zX}Hae??EMe9Fuq!wb2nb{+~xfJISDqAq+e7F^7H(6<`GhvDR6S3bY+{B+aOewBbbT
za^66#A4FC1ZwzC~95ae!UKS0G-4>$))}sP#MwRw3YC$V%=N&i&dz|-iI{gt;BH6|M
z{5UF+3e=g`qK;r4s#5!q`JNr25oX{VsuI7V&iXPcz-<iSQ`8Rrb^WxspI{EEGI^*3
zqBst#P)AdP+SnJUv)}2SAHqD|ZzpMN;z1{F!O3&&-KG2nweV-$kLR%oV<rBM&!Ar1
z<LpNzd>6HmVXVWyQ1L&VXZ9oZpzg?;`ON42ww{JEZARu=D~9np>N4Iz1suR^eB}E7
zpephjRnp)Bf88Y1{0OFC3=d%3jd!8q{)V0c^wLlQcTxRksITFT8&50s`%_T~L{am~
zQFmlD>awnN?m*qCBdDY3L{+jEwXuFw<?feKe+>*VkclIxK%>h17v-YPK91wD9J4Tq
zn%{t0zuP@;!I|{iQ5Cp`n%9R){142*VN@JTP=7ThB>Wc?qWTHc4p*Tv{oM7ppaLGi
zIG#YhDC<LAz8825gP)j9!*6j0UP666gII#EP;sLkzqc1?lwk!v$FH$yk=Y@<fLd6#
z*sKwgsGa?eD*aVdW%}?lyoZ`McZq)l?YMz{FDmirOZ{~vs7vT2Xs9%ms8ZLWO4^7K
z+>QD@=s@l8Dyl*coPVOu_<z)Q9xV5dAQOw}mm-_BjaZ3iQE`W`M&JL~3ja^14poxx
zQ7`xf)A0)G#r>#-Pf#V#AX*d?s0!7iZuLG?g<4RT_$Vr|)5v|c?=T;4;}~1cPa=&1
z241=cla~2sUxup8Dpcv}P=R-#O8=$n@9lmTTpkEqY>S0v1gtF?x*53MofrNgCw=3l
aJ=4~2-L|W#`(^p#K=)6PmG6(Wro06JMA=3F
diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po
index ad992abc..be822312 100644
--- a/locale/en_GB/LC_MESSAGES/Studs.po
+++ b/locale/en_GB/LC_MESSAGES/Studs.po
@@ -576,8 +576,8 @@ msgstr "Removal date:"
msgid "Your poll will be automatically removed after"
msgstr "Your poll will be automatically removed after"
-msgid "You can fix another removal date for it."
-msgstr "You can fix another removal date for it."
+msgid "You can set a closer removal date for it."
+msgstr "You can set a closer removal date for it."
msgid "Removal date (optional)"
msgstr "Removal date (optional)"
diff --git a/locale/es_ES/LC_MESSAGES/Studs.mo b/locale/es_ES/LC_MESSAGES/Studs.mo
index a037bd261c407a673d165f7aa351f9b873b5c82b..2339be802a393b6fa9b554c12934e075f5e5ade8 100644
GIT binary patch
delta 1538
zcmXZcSxD4T6vy#1I$3IqO;c%$O)gWW)o8YuOGRpn20?`bWmYCB3>hidhSNe11wL4i
zMGytqOH_(RC1n!5RWDK$<x5Z$3=u7~NMYY!^9S*B@16g>=iGDe|NpY}RcqG~ceu{X
z-pw+r#PvS2x!8g8Z~zx#1n1!N*=Cuz8q=}Cu?=JCcVish#>IFaS=zoj<DN7#{w#%m
zW3VXA!v80fIRlkAnjf~H8>?{??!tJicgFYQcb8cU)-WE*Fe}EVI35$oaxA7GL*~b+
zSb+*$i;5G<3`a9+W?%*b9jG1mVk*8v?IhM8O{f4z(Jw*mv=r;H!Wr*H5B)w&!Dpzz
zAJB^<s06%}lcvoK)0jk~6jiDq&c_3|0Iy*VzHp40Yc`JlLexUVs6geIh&xaf2qDF>
z!>FUWgi7p@;|t89AO1*VA`K6{ILts|SvD%;O*k3rkz!aYF2$=j9fur$VIF-i7l-4v
zHJFbLsC6&lXzWBC%?;$au=UZn$iNVu!voor1t+j=O_+~caWSew?WhI2aW&q>oA?J+
z$?KF)i9f_7e2%KndsGERQ0sdruiwS_2WTiz6$c-WHK+g$coO&F82o`M@d)ZtB?h8r
z7(nf~3YFkN)bAHiN6?SS_!hO!FeYJaE_Z|Y=B1&_mxIc59cm}FsM5EfGH*kQW0z42
zKg9|78BgN~YW``?LC;^sMR*65Km_%>o53rXieai|12nYoC!B^U930oe@==LZ<8eHM
ztMD(L!4<q3T6hpu!3e5y-*5vCJL7AYMBl27s0tiKmatPxIDZA`cOH0yU+5=t!>E$|
z#WGy5ENU~V#C>=SU*jI!R$#UpALCxkTF#q*=aD7tH*&o!P#C@3TTw@LqLBLQ%sUwv
zhqo|@4^W9sDKa~Pi%@~Oa0MpwwIQ|zaV54R*TM$Tk1-|D`B|unmZQFqJ5d#?!|fOf
z($J2cpgt@S)cg7cmC$6OskG^+iP?^M=%!zQnpc9l3#F()o6oLGXmqvp+)McBa#>IJ
X*p^8NO?Az_oxa*oV^dGA&p+!QvsJDN
delta 1537
zcmXZcTS!$w6vpv&O!JbOb_&fjP1DS4UNXzHi&<$!P@$5N8j>djB?`4L4+%kqK@?aJ
z5>dTGm~o<zGKt=@7b)oCOOO;uL`G4PNdK?1LHy0k*)wa+n%VnZ&)c4%?m%y|nN22|
z?Z(O^vvlmo3>?K=oWfNYx56wHw_*x<9Q$w{{UMx>4{<F%L6){@XFNLDj6aLzUkH{Y
zoA>{OZO*_h4CaRe7>M;4giRQVEzbBc{OL05zy`)!SDKaL7)D|!S%zaQGGwV3gH@=&
zhf#4_Q@#F-jx!L?KtF27K3tBUP&)}o^Cwh{LG(*eJ1s{KRypH7Ttt5um*Oi_;Lo@i
z=THf_DJM;f_tJ3FC`Xm52D7mfbMOvk;TuO+x>*GM9MnP^QGqIO0XCp2(25ktPN9x!
z0F~Ht$2Yi|zV{1_Xd2P<=3@#H%Q8?I@53e7f)v9}<2t;B%W%T+H|EoKb8$Fs+m40k
zL9IK0!FU^WH209_yf#eZIs+5fkDZxj2^h(?H6aV@un<+DOQ;2hupA%bApS*F@-F35
z;?FP&U!y8CiK@UHYW--+o95#Db7?40H3uJxhfo1Lcoy3+1b?AQJcqheVQc(nn2XwR
zH7da_)bH0&M=*l1_z|_v3`Su<9(RNI=BA;`mx;=BCu%2$QKj!dW!{Gr$8Mk&9>azB
z4KLsvYW{i7LC@d90(^u@U<&p7JO*!K0(z;MjndG<Uoj42IXJF`6`&HU$6h>%TW}UH
zV;Qf879K}ca0*qqAGil+obeq+{<mr`ssdhQ2|HKB`76MP^S}q3rXR))qe?c56_{P@
z_c*G=!*~YYV++=;H*3Zh*oNsF%o_13vZVb%u9xMO_%HWC)RFa;P=B5IZ3ZH65Nq)%
zDzPOS&AKrk73e;0!Wh0b#I_pTjF*sWVdI#Ft}_4pbW}wvP+!PKRE3)H5VqFR(2icB
zJ}gtH_w_p}p~XZ~X_HYCGaU0UkbW_0UMcD>l%oRezfu|2?lRwS*l(BXqVGX?r#tk>
R(XOPXw)PVqUw%?r;y=u$tup`s
diff --git a/locale/es_ES/LC_MESSAGES/Studs.po b/locale/es_ES/LC_MESSAGES/Studs.po
index 656842dc..28f5fd2f 100644
--- a/locale/es_ES/LC_MESSAGES/Studs.po
+++ b/locale/es_ES/LC_MESSAGES/Studs.po
@@ -526,7 +526,7 @@ msgid "Characters \" < and > are not permitted"
msgstr "Los caracteres \" < y > no estan autorizados!"
#: choix_autre.php:191
-msgid "Your poll will be automatically removed after 6 months.<br> You can fix another removal date for it."
+msgid "Your poll will be automatically removed after 6 months.<br> You can set a closer removal date for it."
msgstr "Su encuesta será automaticamente borrado dentro de 6 meses.<br> Mientras, usted puede cambiar este fecha aquí."
#: choix_autre.php:193
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo
index 656e53e83ed91d843ba41edc09649f50aa9cebac..8e31fb3f2ba3b3789ab5227e9bc98563c9b16489 100644
GIT binary patch
delta 1964
zcmXZce@s<n9LMqRg?keW`BelLL5^I!B8p0w8Hoxi>6S|vwlK9A+=^Wi#)Zw6?y%`>
zWv&IYwYotys^yl+E`LNnY}$_v`r%d%TlJ5%*2tA@w&9wr-k+VbF<#&2**WL=e!tK2
z-1(uvH$#E56CrnnnT<!yTJa~W!?nxJvM`SMcnCA`1TMx?Sc&6UjXz=)W-uAXT3mp;
zFo=6_A@0R=jNx6_RcWr35sWf%3x0~__$4mES-cH1$nth9!Cb6CeYg=rc%MJsh0_7E
z7W|O;(v@aM@dwm*_pLI!6<t(;Csw&;MFcN1p%0IvGQZ$E?azOQO5|5uigTEQVahMT
z6{t=%p%Q9C2OmLwcMuQYi>N~X#sZvk36#;I)n<hl_N_rJv=j3%j@ftwwea((M3Y#7
zW2on+{P9&(2XohW39LbVXA7#37StBFj}g=mBvF}vi_7p5D${>a6$I9L3Fe~~tU|hM
z4<OrbPod7v8>oeTMpgJ1YO8`QLQa;6DtH63C9Z8F$YSDg%)owBCyt=@{1htV(-^^X
zn1{chp8p3`={#zWOYZaz;bzpKY(qVF4E5egT!f<-Wqo^(;8`Xv;Rqh6H7mw>R0oRI
znZ1u?co;9DI&?q%Q(}FnN{^!sa}u>RALHBjISycaJ>9`8n2ks8CLz|hAp%u8hK)Fh
z1$YzHs{9RJ3zuL%;|S_Htw&wQ22^GHk#1WLX5#Cp>vkGnz%!`CHr?aB--NF2Ycqjb
z7)Ont!#i*c)rpTV7iX{tf5$Lt!`0ei)bkP4d>yXDR#YK_sD)p`VjMv|H(5vj_2T#b
z#2=^@2JiJ2sz6<@dQ|0m{rM+R9Xsy(sy}}g`LikhsdJ%?-g9}Vg`-%A4X7<_+erUQ
z2wWx{Ork3M#CHaB7+*uR_&-#_dG%%-1FOUa+>feg6kowf)U9aU<Q>Aps9W<6sxx1s
z61?FOd_fT0Y_=Px@l9O3#cUYQp+4NgDu=Ke)ym&6gny#8<~lxzK@QN<_%QCk%Xkc(
zt=^$~3w7HjP~UOS6D%c|LREIvH*Fg~tBk{_jN37aCsD1OKy~CI>N;J)bi9VT=huD9
zw{ue%H{(M%g4&`vjO+f_HkonIZ4~vv%c$!yi#o+OPzk1yjS{Iqev@oB>b*hShacbq
zETHTVmZEM+1k-Re?!g+2;xiaDsy#zc&O{2A;SB0t-$b=Occ*vwsxZj79<@NDKi-j=
z&Dt6WoFA^vjszx#o3p<PSgJH9S-3C}>v!6nj_#gB>Oyo~+3;)Iv#L8kd$*&jGuG#H
qE+04;b2{7m`4@8%1HHX{u|%S)=b+QuJ&<sE`+7Q_NIlwAn*KildGTfd
delta 1996
zcmXZddu)?c7{~FacB4$^F6dl$fpwd^AREjHa&f?LcA_G(Z0f+dxU41H80}msF0xP~
z@&}hhr4SM(^D;xyM8ix;Tu_XpAsG@dO3<i@!AlGf#RQWXBVNA0^i7t1&N+SGbDrlp
z=d|Y!xc)idnmmyit2MI^s?9p^TU>#QYRs~60O#Nfn1y?>1P`L#o5Xtj2Jb-+gGJbg
z9$beR*nzj=Ms#BUmtbG5#jK3RI0Lir6Rf~9I1jJj9q5^Fb|;o#9yXvRUW1v~>h#y)
zXD+igJjr<J0<&HCHEP~x>dbD#ou~x&*2T=cG!8SMi6>E!pLRU!jDLX&<VP&W8O%j5
z>6c<Hs#1PbK%MBrZq&Rn?8etniT;iSIHL~~QT9T!Li9Q|pcYz-`8a?%IEq?$A1cr>
zyc;J_&rdu3Yp4q5E=mWm5H-(gR3dGtEr<na+)HB&75RCr!i%U#|3YP84e0>$Q47vT
zs%-0#?Y9xs*?9}K(08Z|e?x7Rn?;DpW}^~bifl>DT4-c5uo-7#1XYPq)Se$iMV!D&
zJcarA1M2xdP?_FD?QuzC`Vg){9m-DBbGuOQ?Z?}39IIL1-lMUHfr~hf&)#QNj5kpg
zC|qoI9OvOEUO-joG3uwlo=0W68+Dk+P+Rj69>Wwyao~QlxA8LO;LA%1i1qDt8p?D6
zAH*pvz`s$Y%3qc);ar?UzXElgmY}X<Gb*z#q}mq3EPNAn-4ggJzK;rQ<?{6VevIk9
zZlIwO4xsvb@GhJ{RpKP(;U)CqFIa^Cp-NlC#_RbC)cA5-fbFP6VyJ}=VKE*>JvX(2
z`s>9noq?;U61pEqFI0)TUQMXXH#*~ksEX}&JmQQWNB(S@f2v$YQ~J3))WTI*h|Q=i
z>};a`r8IUj;KMOgh95g#!d&{-Q6>Ht6>#24Gme4P;2P{gWi*aQa0+!R+E=9y;SSWT
zIfkmtIaGju#%P?O;a<%);8}bJi<`~jcnURf8>@`q7E~#J#!UPbwKX^JDRgsycHkyl
zi(la@Sk{t0bnl{WTM{)->{A-$G^SCRU2}9jWcDz9FDl~aup0NHN|{7e<O1qCT}C%v
zN8R%qj^%!S2k39WPCSZ(ID=bs|9e~cGGO3y)Px>Z)%7Sso#I+lfQ_g?I*{)qdkOX4
zBzEBy^q`-#Gx2fMEosMFup6Jm9#kS9Vuq3J_cSUP_zA0U)+6bAU56@tGwSed!VKJs
zT431ek0h^Vx42v<;`KR|E{nJ2oO7K{&dq(JFl%%Fh_5FU-qx2)RWB}kbbTt(6WSW?
z4@G?2!_kOuC>-4$e9;$3C3^b<!C_x-e|;briRhz1O*9nr1$wpxeM5uvhkJ&GhQqym
WsRRSzX#DAh^7s>ePjXpnf%|{fPyUSn
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po
index db747824..30789b75 100644
--- a/locale/fr_FR/LC_MESSAGES/Studs.po
+++ b/locale/fr_FR/LC_MESSAGES/Studs.po
@@ -576,8 +576,8 @@ msgstr "Date de suppression :"
msgid "Your poll will be automatically removed after"
msgstr "Votre sondage sera automatiquement effacé dans"
-msgid "You can fix another removal date for it."
-msgstr "Néanmoins vous pouvez décider ci-dessous d'une date plus rapprochée pour la suppression de votre sondage."
+msgid "You can set a closer removal date for it."
+msgstr "Vous pouvez décider d'une date de suppression plus proche."
msgid "Removal date (optional)"
msgstr "Date de fin (facultative)"
--
GitLab