From 8ce89a4321b7402a8cac9c511cd114ac2c64dcf2 Mon Sep 17 00:00:00 2001 From: Bob Le Bricodeur Date: Tue, 11 Nov 2014 20:19:12 +0100 Subject: [PATCH] $default_poll_duration variable creation dynamic usage of the $default_poll_duration variable to display coherent information to user. --- choix_autre.php | 6 +++--- config.inc.php | 27 ++++++++++++++++++++++++--- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 16748 -> 16805 bytes locale/en_GB/LC_MESSAGES/Studs.po | 24 +++++++++++++++++------- locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18523 -> 18579 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 14 ++++++++++---- 6 files changed, 54 insertions(+), 17 deletions(-) diff --git a/choix_autre.php b/choix_autre.php index 54b45b3..8c0b268 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -57,8 +57,8 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp $temp_results=substr($temp_results,1); $_SESSION["toutchoix"]=$temp_results; - // Expiration date → after 6 months if not filled or in bad format - $_SESSION["champdatefin"]=time()+15552000; + // Expiration date → the configuration value is used if not filled or in bad format + $_SESSION["champdatefin"]= time()+ (86400 * config_get('default_poll_duration')); //60 secondes * 60 minutes * 24 heures * config if (Utils::issetAndNoEmpty('champdatefin')) { $registredate = explode("/",$_POST["champdatefin"]); @@ -137,7 +137,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp '. $summary .'
-

' . _("Your poll will be automatically removed after 6 months:") . ' '.$removal_date.'.
' . _("You can fix another removal date for it.") .'

+

' . _("Your poll will be automatically removed after"). " " . config_get('default_poll_duration') . " " . _("days") . ' '.$removal_date.'.
' . _("You can fix another removal date for it.") .'

diff --git a/config.inc.php b/config.inc.php index 508c1a9..4f16d7e 100644 --- a/config.inc.php +++ b/config.inc.php @@ -17,9 +17,30 @@ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft) */ + /** + * general configuration + */ + + //is a smtp server is configured to send e-mail ? + //$use_smtp = true; + /** * index.php */ - $show_what_is_that = true; - $show_the_software = true; - $show_cultivate_your_garden = true; \ No newline at end of file + + //display "how to use" section + $show_what_is_that = true; + + //display technical information about the software + $show_the_software = true; + + //display "developpement and administration" information + $show_cultivate_your_garden = true; + + /** + * choix_autre.php + */ + //default values for the new poll duration (number of days). + $default_poll_duration = 180; + + \ No newline at end of file diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index ed66bf3a3526d170e6127f6711e2b91e12b3291a..9532f8e64f01172b23be6b990310515e19fe3e52 100644 GIT binary patch delta 3513 zcmYk-d2miw9LDkU%0^@%#Mx%A60KUY6})3!7(2OY+@7YP#s2v`X(xr4^R_)f(l(E z@mIbT>X3Fqb<`6z&~Vh=7ofIoI`Y7n1*rOKQ0=$c`+@x=;wd{CZS>yD=3{U<%eDK@6BgPEIie1JR3B*dEUz+iw0r z?Qx9P?f3=UK|U9K7{bY#hc99!o<_CH<-Z zn2*1rX5OoV+i)oA5DrI0W;80)Q&AzEgNe8l37*-5tk7IQMed$8lyGZ{TVfF7n*G*+@?vnZyEpNum1UwPG!Vlu2Q{&g_Wmeq0cy{up(3yZ^%$EJwB5fC~8*)ZQOQz1VJ8 zAEWBWun&q@d(@f943J17F$mcvGZoe0$Ec3hqC&VI)u0-+(zD1b!PHp8yST5|1k^+Z zqw4!n6PbpJ+(OjWEy0Eu*g--K4xk!bM6LW!)Sli!br9UujYKQd3X*KTH)?{}7=gK{ z{>EV>&O&X)0@T9Rp&q}l-1`BuhlEyo4E4^xj)j<$>K?j%sD_uY0&rCF)EaKyAf!R3z`ACRm37g)aPgx1c#TBAed? zgY!`JSD`xGZ13;Ic=F$)&eB~}y@#m&>SwzB$7K?Kb(BGYd?eQnn({mrS#nC;8zdG*E`*sKBpbzWuew~K{ zuo6$A8s_wLzZH{FD?5V<{W;XcFXCvtjeZ>5%iV%)m{0yZYT`Y5yX}SqNa)Qp3>BI; zP@yhHg>*LZwls?{4tHT|Jco){tu?5RyT{E?&v^&b79?UGcBA?Y)R7oL zqJ3ZYqcQ^(kt);xhfuH7v#5bDV=g{Ig*@BmepF_nJ}MhfPs<@xgpQ*Q@oCh=enHNi zxrA*9yoq5tI+bbI4!fiFd=x4oC8&^9qB>lG3i)cAU*{}{NcI?KXGCAmLFax%rsuem z5_!$@tn&mAj?eFbXRN5uKbn=9f fiFuR!zDY%SlMA~{C@Jbwm6X)7`BNkKpX&X8^{|=& delta 3433 zcmZYAdu)$a9LMqVLoa&$wbklHx1XwNwWxO5xwKkgY>3Mmnyid&D5E+ih{n(AHVfKdeKn;qp4GzI2ILwxxL3R8+ zs)I|Y3EZ}M4;!r0AB!sY*?c}~0)tTP#-q02EhISRZNE*dLLI72s8F9qh4K<=g4a-? zyJz!HP=_>x{ZL0qsDW}(dp!)bb>oo-#!N@muSWH^#@_eWk?2anPE-UgqAFfNb$ACg zfO*dCDBhZh8lceTN26Bw25O@7ZGIW5zx9}nTd@aTL4xNu!JM2*3R2OB4tBvk$hMoy zs6Bp!>bR@Vm|d8IMff|ez%)+SGTe@8m&2no1xKJ3whI;deW-~a!ZJPo=SZkx7Ncql z)?zsxK+U{Us@t#!>Ja9lA~OIL>M^L0PQrAoLV{*KMOJ9`p|;?H^%iQ2|H8J6Z-R(F zKNHHoUf3J^;$$qw4XBQroQ(~t+k ztVO?0^>z|Ey?e1OHenw;jzrx&L4srwnT7Va02P5Ts0dBPb~qmcu-fKp@JEj^D{Xlh zqtD=eIr{KycjB+TxKDvrVlv%{gkuodc+`Y^sQanb-l#n;M6I|K_1KkTC@#ccTyD!h zKuvTDDk6;-i0!k8zixQ5+!b_2?P;2|5Atp@gHiP+pc+=9LOc((*B_x?WIL@VQ1yR7 zMeHu>jOgfRfEU>n)6Y*r9Zp7dRDlZN3RHvDsFiL+9(mJfy?`8a^8huG=$>xO*R`AH?1396ZU@V4V5~{;=49CH! ztr&}1*mTquSK0eDsD*xryyE?42Z@;!#AmyQZ8@sp7F>*9VFhOPc31o{YT!m|Git&u zsD<3ZNq7etz>LUozafpNGchjLt^Yd4>G_{Wf_r8)M&c3F;X8-w@F!GcuG;)Vj3NIR z71EFw+;(xO`f1n(GjR#_wBkGIZ79jcY6t=NHz%D2ydDz7Kq$V090WzA zYmtL*nox)DK2~DLi|&hMA$B4E8S3ddjN0PMsD49vz3#&JzQn(X#J3czz%bsc%g{kJ zjPLJ$8*)%9TaOBT9V#-Lu?+X(6pS9=ZovX9Ctr`6c$)&ZT@30FCZHmd;wPa{=c7XU z5~kxgOh(;L!a7uh4p_fK?eTTgbAAuC1rM#=1 U-IFpBI{v@zP$#yy6ZL2P3kX|xga7~l diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po index 7b4a345..c239848 100644 --- a/locale/en_GB/LC_MESSAGES/Studs.po +++ b/locale/en_GB/LC_MESSAGES/Studs.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: Framadate 0.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-23 20:52+0100\n" -"PO-Revision-Date: 2014-10-23 20:52+0100\n" -"Last-Translator: JosephK\n" +"PO-Revision-Date: 2014-11-11 20:12+0100\n" +"Last-Translator: mrB \n" "Language-Team: JosephK\n" "Language: English\n" "MIME-Version: 1.0\n" @@ -81,6 +81,12 @@ msgstr "%A, den %e. %B %Y" msgid "Expiration's date" msgstr "Expiration's date" +msgid "days" +msgstr "days" + +msgid "months" +msgstr "months" + ########### Language selector ########### msgid "Change the language" msgstr "Change the language" @@ -555,8 +561,8 @@ msgid "Removal date:" msgstr "Removal date:" # Step 3 choix_autre.php -msgid "Your poll will be automatically removed after 6 months:" -msgstr "Your poll will be automatically removed after 6 months:" +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." @@ -616,12 +622,15 @@ msgstr "" msgid "Thanks for your confidence." msgstr "Thanks for your confidence." -msgid "\n" -"--\n\n" +msgid "" +"\n" +"--\n" +"\n" "« La route est longue, mais la voie est libre… »\n" "Framasoft ne vit que par vos dons (déductibles des impôts).\n" "Merci d'avance pour votre soutien http://soutenir.framasoft.org." -msgstr "\n" +msgstr "" +"\n" "\n" "\n" "\n" @@ -666,3 +675,4 @@ msgstr "Author's message" msgid "For sending to the polled users" msgstr "For sending to the polled users" + diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index 95ecc918e15b01882872e5d1bb4bed4458eaf67e..3053598a8a96ef2f5cad3cb99b80e471babd507b 100644 GIT binary patch delta 3520 zcmXZd2~gB!7{~EvVL^~%RfN0+O+4`6@Ptr6&1xLS3r&p-6aj%nL8lzjjgf9sn!g>I zrBT_KjXF4u<&jsEnyEGA7)sh@Hf3IonbTO`U;Ag+{k-qH|Mz{L_j%uU_iTg5dC?R2 zu7md_iG7H47`EW%J+ z=zi{Zt;No?KZB8G0c)g?K*ReOg@-W$PrB`Akh$#&PDP6|BSxEsYM+f>EXP<}1~6i@Yg??_w|9iptOl)blN<=Wn7i5KbDI z!=jKTOGIU4IBFr|-TEw4fTbAF-uWqLz*>yKSCD^uhc~ToFKVw3qdxxzwc;PK3_W*o zZm=AC;u%!GTet%M#Zp|sek9>9sCgqhlYbQw$d4lKjatbld;~|MCfJA@F|tcA#amF% zHz6_D5lqMPsEl-AH9Ca7P~#0iWoC$5ABW1w{awkwQd&TRI+nQ)EW;4$EAR=dbK67M zI1SteHGmHlKySC6iMj=o-1b>+eGw{vT2#LV)E2xQpg?x)J=a61!_|UHwTC<_l|EE} z38;)EyY&pz=^l$3XF6)43e?`$p|-98xj@#4dj12{c!5vd2To%j8ZMzy7TY8EU>s_| zyHOL2LJc&N8S3fs1j2V+T#?|zz<^+mSYa~;AB08bFm&TqWYC{b&Byx)WUv4rT!|m*Zsdq;UO9#m`x8B zqqg94EW+!k$n)88_Y|t%D*+0MdW7$NsnjmB|)V|B%$+g#Azp%S3HWU@`^fvV7D^>rs2!fYG=UBk%xfqNAvv)$dV( z-$pKo#S*nvl#Vet4z=Q`sPPt~uH#y_z6}{SU|&*b&j&52j=v)Z)^6j=n3Qhz27ZV- ztTQu$8K}nX)R*Do*nennrJGTK9Y?M70_xD-L~T(5Y2J)IaH;NpGle&4$QmBJ$E~P< ze#ee@2lFs)L~y_vs7zI$Qur9^a4kpOng-Ohdkr@Kt&imnr|oUgp=_sHsZiBW)7Z24LmQ0{m12~Ox{FY+dHVO z@e;)hjK^B6z;Sp9>v2$klNC#$33c5Lq6RvFNq8EyvRkgcv80cBGAdv{>b9&$W%3{@ zBj-@J=?@IWe^A$4v&$hk5d#lXc#y(YtU&L0ell?}a!{=mHDLU`!E4nQb&9i40glIM zSb}`l*dA2B->?9C6Rj3hhsw;es6)O6L-f0}o?b8*7b{{Vu1osIwi delta 3458 zcmXZd3s6->9LMp!0&2*GiztE*xF|jlH4zoPimwz&$Vkz0e3Ck$5aSJ8$#4-%xRA?6?g_`;;L|Cy!Z$5F;Pv8(W9L)7*ntj4#5B% z;rxB1<9LjwJr|!a#&6!B5J|%-Y=ULj7iH15QH?xDwmoI#l4F zVh|oc^{Yg!_!KI`Hyj%>X&m#Lb`%uRFjR*eE1fXcu% zWNdQ_`8-amG7?F8wUG9xdS6t4>FC$qjijIf$Dk~o1}eqN zTiVaBL*_OgV-KuEW#k^}5H?^{8ZQ`?nJ}jwkIG0wEAp?DrqZB}Pdg8c!v@qRVG-sy z?LVUizK$B;4k~~EHdghPs9Vqt)!x^sXQ2WZk9uwnY72_}6v&QQ;kX5LxGGSozJf~S z9aMnzsEjov|Efoz4r@EqI6YAlWuo>v2eox`kc(s9Ks{fI>hCXi9{3#F(@={_*=^K= z_fZ1|#@G`?qXtTH9EzIYd8a-DwZg@yKuetZM$~w_u{$2cuDbvCDUd}I$H~dZRP^E} z*bYx3+ivcn_PB}H9(Vxmp`L+*@DVP>ft;{nJdWy@!PS|L(@_gMflB>p4A=d?Kw$z6 zzoH%-#;n?c?f4>|MMd5#-tL%&I)s_1%#1;$dL}BR3$YU}N0MjupcZ%|3f$P zo2KMF0KLe^#PjP(9D#lDRUC|;p$4wUY>XvJ9~Pogy$dzLA>`F+PN62ggro2wreJzU zUS?Q?er}4{PC=*oIO_C%iwfux_QD@A79*IQB$;H?9*;$3U?wUp;A8@xgcgL zDicMhKrHm)JE(Cha5A3gLjD_4NaQH$1=ItZU^?nLWjp4fCMrgq_HtBU`;l!lRmiTG zt4_U1H(p-UyQ3z27S(SGD)4!z%r5m)NTP5E73po%Ko3xR*ph>w0OL^uC87fBkD53e z6L29alVzy>Cr}gK#m8^f?)KJ1BSV`Q)I$BwP|%)^!w_7Ijd3|@qIIZ$quWrCS0fj~ ze21FgZ*-%ZRcOVnP~-Vf*KeXzpN|^%T@1%Eq@UmHqrky5)%X_P#P{*_9;_a{$#w?% z;V$Y!a53IPt#o!zJFrsJO1Gj8Yb9!nE@L@f$5(JQdH(WYLBAqC zM?oF0VKn}WN?{A1Jy8lOGg+vP)1CGOPWxKNa;N9nv zDl=PC$-g2zPs35Xf?4?C0Ase`L$q-HKzraWgN#`~Jq?x0N({mp)YhEDu~>(TuoqDc z#obtp^%#naIAFSMEBq8R(AyY?n^0SE#PK2yr+x<&amrKnZJCNnYqbKBS*XA~UW S?6YpBZMI5=udrg%3;zdWrju*{ diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 5de3587..c647757 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: Framadate 0.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-23 20:52+0100\n" -"PO-Revision-Date: 2014-10-23 20:52+0100\n" -"Last-Translator: JosephK\n" +"PO-Revision-Date: 2014-11-11 13:19+0100\n" +"Last-Translator: mrB \n" "Language-Team: JosephK\n" "Language: French\n" "MIME-Version: 1.0\n" @@ -81,6 +81,12 @@ msgstr "%A %e %B %Y" msgid "Expiration's date" msgstr "Date d'expiration" +msgid "days" +msgstr "jours" + +msgid "months" +msgstr "mois" + ########### Language selector ########### msgid "Change the language" msgstr "Changer la langue" @@ -555,8 +561,8 @@ msgid "Removal date:" msgstr "Date de suppression :" # Step 3 choix_autre.php -msgid "Your poll will be automatically removed after 6 months:" -msgstr "Votre sondage sera automatiquement effacé dans 6 mois :" +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."