From 3e1ef601cea46d6a108a5637d7ea7809231a4b61 Mon Sep 17 00:00:00 2001 From: FramaJosephK Date: Thu, 26 Feb 2015 13:33:03 +0100 Subject: [PATCH] =?UTF-8?q?Nb=20de=20colonnes=20minimum=20du=20sondage=20p?= =?UTF-8?q?ass=C3=A9=20=C3=A0=201=20au=20lieu=20de=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/index.php | 4 ---- adminstuds.php | 2 +- choix_autre.php | 2 +- choix_date.php | 2 +- js/core.js | 22 +++++++--------------- locale/de_DE/LC_MESSAGES/Studs.mo | Bin 18245 -> 18253 bytes locale/de_DE/LC_MESSAGES/Studs.po | 4 ++-- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 17035 -> 17051 bytes locale/en_GB/LC_MESSAGES/Studs.po | 8 ++++---- locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18822 -> 18864 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 10 +++++----- 11 files changed, 21 insertions(+), 33 deletions(-) diff --git a/admin/index.php b/admin/index.php index bb3078b..61335d5 100644 --- a/admin/index.php +++ b/admin/index.php @@ -113,7 +113,3 @@ while($dsondage = $sondage->FetchNextObject(false)) { echo ''."\n"; bandeau_pied(true); - -// si on annule la suppression, rafraichissement de la page -if (Utils::issetAndNoEmpty('annulesuppression') === true) { -} diff --git a/adminstuds.php b/adminstuds.php index 56c159d..7ba17d8 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -880,7 +880,7 @@ if (substr($dsondage->format, 0, 1)=="D") { } // Remove col - $tr_add_remove_col .= (count($toutsujet) > 2 ) ? '' : ''; + $tr_add_remove_col .= (count($toutsujet) > 1 ) ? '' : ''; } diff --git a/choix_autre.php b/choix_autre.php index fd69bd5..f0187c5 100644 --- a/choix_autre.php +++ b/choix_autre.php @@ -179,7 +179,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
'; echo '
-

'. _("To make a generic poll you need to propose at least two choices between differents subjects.") .'

+

'. _("To make a generic poll, it's better to propose at least two choices between differents subjects.") .'

'. _("You can add or remove additional choices with the buttons") .' '. _("Remove") .' '. _("Add") .'

'; if($config['user_can_add_img_or_link']){ echo '

'. _("It's possible to propose links or images by using "). ''. _("the Markdown syntax") .'.

'; diff --git a/choix_date.php b/choix_date.php index b9f6314..b8dae26 100644 --- a/choix_date.php +++ b/choix_date.php @@ -191,7 +191,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp

'. _("Choose the dates of your poll") .'

-

'. _("To schedule an event you need to propose at least two choices (two hours for one day or two days).").'

+

'. _("To schedule an event, it's better to propose at least two choices (two hours for one day or two days).").'

'. _("You can add or remove additionnal days and hours with the buttons") .' '. _("Remove") .' '. _("Add") .'

'. _("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)").'

'; diff --git a/js/core.js b/js/core.js index dd4a4aa..87b2914 100644 --- a/js/core.js +++ b/js/core.js @@ -188,25 +188,17 @@ $(document).ready(function() { }); }); - // 1 day and 2 hours or 2 days and you can submit + // 1 day filled and you can submit function SubmitDaysAvalaible() { var nb_filled_days = 0; - var nb_filled_hours = 0; $('#selected-days fieldset legend input').each(function() { if($(this).val()!='') { nb_filled_days++; } }); - $('#selected-days .hours').each(function() { - if($(this).val()!='') { - nb_filled_hours++; - } - }); - if (nb_filled_days>1) { - $('button[name="choixheures"]').removeClass('disabled'); - } else if (nb_filled_hours>1 && nb_filled_days==1) { + if (nb_filled_days>0) { $('button[name="choixheures"]').removeClass('disabled'); } else { $('button[name="choixheures"]').addClass('disabled'); @@ -218,8 +210,8 @@ $(document).ready(function() { }); SubmitDaysAvalaible(); - // 2 days and you can remove a day or copy hours - if($('#selected-days fieldset').length>1) { + // 1 days and you can remove a day or copy hours + if($('#selected-days fieldset').length>0) { $('#remove-a-day, #copyhours').removeClass('disabled'); } @@ -256,13 +248,13 @@ $(document).ready(function() { $('.choice-field:last').remove(); var nb_choices = $('.choice-field').length; $('#choice'+(nb_choices-1)).focus(); - if (nb_choices == 2) { + if (nb_choices == 1) { $('#remove-a-choice').addClass('disabled'); }; SubmitChoicesAvalaible(); }); - // 2 choices filled and you can submit + // 1 choice filled and you can submit function SubmitChoicesAvalaible() { var nb_filled_choices = 0; $('.choice-field input').each(function() { @@ -270,7 +262,7 @@ $(document).ready(function() { nb_filled_choices++; } }); - if(nb_filled_choices>1) { + if(nb_filled_choices>0) { $('button[name="fin_sondage_autre"]').removeClass('disabled'); } else { $('button[name="fin_sondage_autre"]').addClass('disabled'); diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo index 0c358de6e43b1db87a50b2075fe770528fc4b9d2..3b051fc0ab0fa7163f4d85f497f5d17bdb56f5a5 100644 GIT binary patch delta 2104 zcmZY9e@xVM9LMqZbsSpW9Vg(SDR>7cp7Fy7B?!d}O>IomWj1Y83Jz#ar$^SZzQmS) zB^I~UN}?t9N42SS&cd?(aBXRGwALE66-%~oqm|T3%`ttx`hNe5-QDB!`EcLQkN5li zxi5Qt7khmtg8}CWGh1I`)`ll=AT`m|bb&R(u!_VLe{LAQqOn3oORl z=`TkuyasD=2R7poT#T3TPRv{6m`$Tm$?SLFGSr5WxD;38e0&az@d)PO=covLi;B=V zX5lpq;FQ<*C(OotL=83m8>{!=pBTq3=Pt7uG+sxYWDpDRBx>TXa60~gGw>1;UHcss z(!6qaqJ=n%{#w+@T5vW#i+ZjPi*NvE;#qtgonacRKzOX4K$#>zYRH{V^4Vl2auP&%!hLHDJrDDVl_^n zQdC5N=;R61h8mDy*drLj9^_0mh)UTvs1yH%icDaMo8lOjv%Zzm2=b4O$OW(#j9?FH z!89r*1E`3cMooATRpp}?!6^)5_-=P&g{Y0xqQ+a1vao%q2=`-%_3ao9E%Xsm@OBnk zaSRXRT8^)UMlc)y!2z7Y-PnJR**px^xHXXQY(%AKGb)l#Vju3r=kYo^U(?u6scVN# z%iIYzp%!e%`|+UHKaVQLanyuYP*wal>O=+HwOpK!GqD<#qE)Dkx1gSD!+RU{P*sHz|GY{l91pYeRv^L^BW=TJHS5%t`J*T3l*sdqOTN6NzLPz!dV=1rj@ ze#oJr3Hwp^H-mHVJce)#^~FidLA%c#kD&TRsEt%2!LvqOh5J$Se1_flJu0PJ8r)mb zg{m3nH5yGcGN{m8#rH64x%*Rl991L!72I_kMuql;MzcNm7AoZ7mG19I6qWmVcmOML zFMfcEL{ZZ09o&E%(6LDxDvq0|YR#tN;+Tudbqy*q%~+1xF@c9YhdjqnCk}BM9i$9z z!x}8XTBP7@8*ar{aI^0J1PyMGC5c-*b|G`w&!`l{SGzf`LREhgDwNHrkayx1Jc?W- z`xj%lw2SIOxAM&g;LONWbZ0ov~P4*&oF delta 2096 zcmY+^drZ}39LMqRNe-cK4j18Y4wQ00u7RkbctjJ7@-oAggi|SvWUD2e>^61fueGqU z4L1(C6|Lqam(jeDZOuQ_Hm9>J>W^BoI&QSmT3%|*+Nsw2)9?3BjKk}Bo}J(GJm1TY z^L@V4eZIq4ey7vS+RDtjaR@6gcbZuj&cz%YL_dCj8F&=)@i+!?1hX-TRd^L|#c;V< zG0wp}yw9^61I#yCTIlW;ofLNT0;3venvg{7Fl$@mc}1Lsf~N@5yb zLqCpt^AwKxSg3Z_f8g{Nnf{DX>~U`677TWxA{oR&d=ItpNzA}6F%vH!*|i^0Db1{P zH=2S4%$re>bzm4bp`P1;Q*amN;xSx@&KU-}ab=wwQ5`BHi!g-CJRiac^UbIX^rJT3 zkE;DqRO&xLs$!p^F8VvF6yfRa1sYJ_Ux@_h*u&n!)5x#A#2?jY7?slRaTboDN))0& z6nPYNp#~%w)`lgx6^Y3PQ6)Qziue~)X8uN%I6On&qyD!r$YNnB@&Z@~=HOP;fv=%T zvI~`wgQyKpqq_VX%)xOCV){(?Vg;y+)T7ork#?}hP#GS;0O#9V40O=@NWFF z6PpQN2aRAlUct9<9OF1}J3(MtgWCg9&qh>!!R0wcdh-*p4dMMpR9=U_K6@_B(*;_9Ga=5mZzDgnBN>KNmG?ag6+{ zNy=GJS1+M-H6I~ufsqa z4xrxOA&lTD4B#m0in3Bfh|Qf_q~{gYq1U2V>MZ}Lktx0x2OYBsEE@RyBR3Lbmp^AsgB_UY)O2amGr%v zcq6dFzlZsW#Pz`B{$PG&ACq-_n)z(!vz*U=KZ&~FA>TX0-vx_(zH^B`v*SJ+el#bQ cH?d?({F#!+ySq0eHkBp+H;WE$oAyQNzX=!i3jhEB diff --git a/locale/de_DE/LC_MESSAGES/Studs.po b/locale/de_DE/LC_MESSAGES/Studs.po index a4aec2b..58ceb65 100644 --- a/locale/de_DE/LC_MESSAGES/Studs.po +++ b/locale/de_DE/LC_MESSAGES/Studs.po @@ -455,7 +455,7 @@ msgstr "Umfragedaten (2 von 3)" msgid "Choose the dates of your poll" msgstr "Wählen Sie Terminmöglichkeiten für Ihre Umfrage" -msgid "To schedule an event you need to propose at least two choices (two hours for one day or two days)." +msgid "To schedule an event, it's better to propose at least two choices (two hours for one day or two days)." msgstr "Um eine Umfrage für einen Termin zu erstellen, müssen Sie mindestens zwei Auswahlmöglichkeiten angeben (zwei verschiedene Zeiten an einem Tag oder zwei Tage)." msgid "You can add or remove additionnal days and hours with the buttons" @@ -495,7 +495,7 @@ msgstr "Alle Uhrzeiten entfernen" msgid "Poll subjects (2 on 3)" msgstr "Umfragethemen (2 von 3)" -msgid "To make a generic poll you need to propose at least two choices between differents subjects." +msgid "To make a generic poll, it's better to propose at least two choices between differents subjects." msgstr "Um eine allgemeine Umfrage zu erstellen, benötigen Sie mindestens zwei Auswahlmöglichkeiten zwischen verschiedenen Themen." msgid "You can add or remove additional choices with the buttons" diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index 54aba0404469a72aa4860252b777e5c624b05758..b21ecdccb2ba358cd6eb6166438c7b0739c6d9ce 100644 GIT binary patch delta 2171 zcmZ|QTWr)t6vy%NZ@bV!cej+HZLzSuxr-K9TU%S%A}ttE0$wm6)yl@O+(K-l)hH$` zL`u{KY4b;eR1{I+iG)xt@?Zr?iqX&qyg;IoVuG}&Bov86WAyv;|9|1ZhvqY9I&)^` z%J4K`bI(f;rfZx8Qmlk3E=;>0SOm_M&$FDL#gSsFRjbH}%I*Cu%_5`E1{X zSV;U7YTOH$i(7nMRG!_aE7^xS$Vr^U`gXx<*dM3_!5Lmjr=T8HHBv2WMy}u1p%S{N zL_1L>{sc9?A9eCUybXta13au!;xg1m=3$uiElGo&SUakeTToZ=2C7v1Q4@|~7{5hT z;v(u(a2YlK9}MB7xOadGR9uhR-~*`2EJWpN!656~i!^jMn^7n0Mcw@#4ZuUFlYWkC za0u7oLw9+P@+fNFS=@luG9e3&X>*hCay(2!gf?;UPhJrO;kyDVGQ?U34Vt<;qR!*<=y95j=JJH)W>`t z>i5Uy)0j!ev&iA?J#4~rsKmu{ydRyp$l+}Vsv=*b78pW(#a=@#{5NV|5lK|?X4H>P zI~HRv>QNuTtQ9o+Y3LQ7MD1)4dFXZqr(kxo_b8)SMmz&`=Z~T)l0sE%J*wngsFHX4 z@!Rf5?qbLK8iSdRV{TJusWafd6Z$3iA%nEDqx|i5d%_Ex<9$Dd$2-p6zLC6Z`N68l qnvUr6k!MmJ9jWKs(-oy|qOt$x-oDcn_ZQyW^}hpeWV(Mfb^i-4zyo#w delta 2155 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 X`B-mVwv!zCZy?%RwB=nAHuV diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 62302fe..74af27d 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/locale/fr_FR/LC_MESSAGES/Studs.po @@ -461,8 +461,8 @@ msgstr "Choix des dates (2 sur 3)" msgid "Choose the dates of your poll" msgstr "Choisissez les dates de votre sondage" -msgid "To schedule an event you need to propose at least two choices (two hours for one day or two days)." -msgstr "Pour créer un sondage spécial dates vous devez proposer au moins deux choix (deux horaires pour une même journée ou deux jours)." +msgid "To schedule an event, it's better to propose at least two choices (two hours for one day or two days)." +msgstr "Pour créer un sondage spécial dates, il est préférable de proposer au moins deux choix (deux horaires pour une même journée ou deux jours)." msgid "You can add or remove additionnal days and hours with the buttons" msgstr "Vous pouvez ajouter ou supprimer des jours et horaires supplémentaires avec les boutons" @@ -501,8 +501,8 @@ msgstr "Effacer tous les horaires" msgid "Poll subjects (2 on 3)" msgstr "Choix des sujets (2 sur 3)" -msgid "To make a generic poll you need to propose at least two choices between differents subjects." -msgstr "Pour créer un sondage classique, vous devez proposer au moins deux choix différents." +msgid "To make a generic poll, it's better to propose at least two choices between differents subjects." +msgstr "Pour créer un sondage classique, il est préférable de proposer au moins deux choix différents." msgid "You can add or remove additional choices with the buttons" msgstr "Vous pouvez ajouter ou supprimer des choix supplémentaires avec les boutons" @@ -580,7 +580,7 @@ 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 "Removal date (optional)" -msgstr "Date de fin (facultative)" +msgstr "Date de suppression (facultative)" ############# Admin ############# msgid "Polls administrator"