From 307f36ae64f03330e8b70508255873192518ec62 Mon Sep 17 00:00:00 2001
From: FramaJosephK <josephk@framasoft.org>
Date: Fri, 14 Nov 2014 17:35:22 +0100
Subject: [PATCH] fix a11y + reprise config.inc + bug date_format win
---
adminstuds.php | 47 +++++++++---------
app/classes/Framadate/Utils.php | 2 -
app/inc/config.inc.php | 47 ------------------
app/inc/constants.php.template | 15 ++++++
app/inc/functions.inc.php | 24 ----------
app/inc/i18n.php | 14 ++++++
app/inc/init.php | 1 -
bandeaux.php | 12 ++---
choix_autre.php | 40 ++++++++--------
choix_date.php | 17 ++++---
creation_sondage.php | 33 +++++++------
css/style.css | 12 +++--
index.php | 49 ++++++++++---------
infos_sondage.php | 76 +++++++++++++++---------------
js/core.js | 9 ++--
locale/de_DE/LC_MESSAGES/Studs.mo | Bin 17793 -> 17896 bytes
locale/de_DE/LC_MESSAGES/Studs.po | 7 ++-
locale/en_GB/LC_MESSAGES/Studs.mo | Bin 16805 -> 16928 bytes
locale/en_GB/LC_MESSAGES/Studs.po | 16 +++++--
locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18579 -> 18710 bytes
locale/fr_FR/LC_MESSAGES/Studs.po | 46 +++++++++---------
studs.php | 32 ++++++-------
22 files changed, 235 insertions(+), 264 deletions(-)
delete mode 100644 app/inc/config.inc.php
delete mode 100644 app/inc/functions.inc.php
diff --git a/adminstuds.php b/adminstuds.php
index 819494c1..0ea9a4ca 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -76,24 +76,24 @@ if (!$sondage || $sondage->RecordCount() != 1){
$dsujet=$sujets->FetchObject(false);
$dsondage=$sondage->FetchObject(false);
-// Send email (only once during the session) to alert admin of the change he made. ==> two modifications (comment, title, description, ...) on differents polls in the same session will generate only one mail.
+// Send email (only once during the session) to alert admin of the change he made. ==> two modifications (comment, title, description, ...) on differents polls in the same session will generate only one mail.
$email_admin = $dsondage->mail_admin;
$poll_title = $dsondage->titre;
function send_mail_admin() {
global $email_admin;
- global $poll_title;
+ global $poll_title;
global $numsondageadmin;
- if(config_get('use_smtp')==true){
- if(!isset($_SESSION["mail_admin_sent"])) {
- Utils::sendEmail( $email_admin,
- _("[ADMINISTRATOR] New settings for your poll") . ' ' . stripslashes( $poll_title ),
- _("You have changed the settings of your poll. \nYou can modify this poll with this link") .
- " :\n\n" . Utils::getUrlSondage($numsondageadmin, true) . "\n\n" .
- _("Thanks for your confidence.") . "\n" . NOMAPPLICATION
- );
- $_SESSION["mail_admin_sent"]=true;
- }
- }
+ if($config['use_smtp']==true){
+ if(!isset($_SESSION["mail_admin_sent"])) {
+ Utils::sendEmail( $email_admin,
+ _("[ADMINISTRATOR] New settings for your poll") . ' ' . stripslashes( $poll_title ),
+ _("You have changed the settings of your poll. \nYou can modify this poll with this link") .
+ " :\n\n" . Utils::getUrlSondage($numsondageadmin, true) . "\n\n" .
+ _("Thanks for your confidence.") . "\n" . NOMAPPLICATION
+ );
+ $_SESSION["mail_admin_sent"]=true;
+ }
+ }
}
@@ -109,10 +109,8 @@ if (isset($_POST["boutonnouveautitre"])) {
//Email sent to the admin
if ($connect->Execute($sql, array($nouveautitre, $numsondage))) {
- //if(config_get('use_smtp')==true){
- send_mail_admin();
- //}
- }
+ send_mail_admin();
+ }
}
}
@@ -757,9 +755,10 @@ echo '
</div>
</div>
<div class="form-group col-md-7" id="description-form">
- <label for="newdescription">'._("Description") .'</label><button class="btn btn-link btn-sm btn-edit" title="'. _('Edit the description') .'"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">' . _('Edit') . '</span></button><br />
+ <h4 class="control-label">'._("Description") .'</h4><button class="btn btn-link btn-sm btn-edit" title="'. _('Edit the description') .'"><span class="glyphicon glyphicon-pencil"></span><span class="sr-only">' . _('Edit') . '</span></button><br />
<p class="well">'.$description.'</p>
<div class="hidden js-desc text-right">
+ <label class="sr-only" for="newdescription">'._("Description") .'</label>
<textarea class="form-control" id="newdescription" name="nouveauxcommentaires" rows="2" cols="40">'.$description.'</textarea>
<button type="submit" id="btn-new-desc" name="boutonnouveauxcommentaires" value="1" class="btn btn-sm btn-success" title="'. _("Save the description") .'">'. _("Save") .'</button>
<button class="btn btn-default btn-sm btn-cancel" title="'. _('Cancel the description edit') .'">'. _('Cancel') .'</button>
@@ -840,7 +839,7 @@ if (substr($dsondage->format, 0, 1)=="D") {
$current = $toutsujet[$i];
$border[$i] = false;
- $radio_title[$i] = strftime("%A %e %B %Y",$current);
+ $radio_title[$i] = strftime($date_format['txt_short'],$current);
// Months
$td_headers[$i] = 'M'.($i+1-$colspan_month);
@@ -856,11 +855,11 @@ if (substr($dsondage->format, 0, 1)=="D") {
// Days
$td_headers[$i] .= ' D'.($i+1-$colspan_day);
- if (isset($toutsujet[$i+1]) && strftime("%a %e",$current)==strftime("%a %e",$toutsujet[$i+1]) && strftime("%B",$current)==strftime("%B",$toutsujet[$i+1])){
+ if (isset($toutsujet[$i+1]) && strftime($date_format['txt_day'],$current)==strftime($date_format['txt_day'],$toutsujet[$i+1]) && strftime("%B",$current)==strftime("%B",$toutsujet[$i+1])){
$colspan_day++;
} else {
$rbd = ($border[$i]) ? ' rbd' : '';
- $tr_days .= '<th colspan="'.$colspan_day.'" class="bg-primary day'.$rbd.'" id="D'.($i+1-$colspan_day).'">'.strftime("%a %e",$current).'</th>';
+ $tr_days .= '<th colspan="'.$colspan_day.'" class="bg-primary day'.$rbd.'" id="D'.($i+1-$colspan_day).'">'.strftime($date_format['txt_day'],$current).'</th>';
$colspan_day=1;
}
@@ -956,7 +955,7 @@ echo '
' . _(' remove a column or a line with ') . '<span class="glyphicon glyphicon-remove text-danger"></span><span class="sr-only">' . _('Remove') . '</span>
' . _('and add a new column with '). '<span class="glyphicon glyphicon-plus text-success"></span><span class="sr-only">'. _('Add a column') . '</span></p>
<p>' . _('Finally, you can change the informations of this poll like the title, the comments or your email address.') . '</p>
- <p><b>' . _('Legend:'). '</b> <span class="glyphicon glyphicon-ok"></span> =' . _('Yes') . ', <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = ' . _('Ifneedbe') . ', <span class="glyphicon glyphicon-ban-circle"></span> = ' . _('No') . '</p>
+ <p aria-hidden="true"><b>' . _('Legend:'). '</b> <span class="glyphicon glyphicon-ok"></span> =' . _('Yes') . ', <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = ' . _('Ifneedbe') . ', <span class="glyphicon glyphicon-ban-circle"></span> = ' . _('No') . '</p>
</div>
<div class="hidden row scroll-buttons" aria-hidden="true">
@@ -1079,7 +1078,7 @@ while ($data = $user_studs->FetchNextObject(false)) {
for ($i = 0; $i < $nblignes; $i++) {
if (isset($_POST["modifierligne$i"])) {
if ($compteur == $i) {
- echo '<td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="validermodifier'.$compteur.'" title="'. _('Save the choices:') .' '.stripslashes($nombase).'">'. _('Save') .'</button></td>'."\n";
+ echo '<td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="validermodifier'.$compteur.'" title="'. _('Save the choices') .' '.stripslashes($nombase).'">'. _('Save') .'</button></td>'."\n";
}
}
}
@@ -1186,7 +1185,7 @@ if ($compteursujet == 1) {
echo '
</div>
- <hr />'."\n";
+ <hr role="presentation" />'."\n";
// Commments
$sql = 'SELECT * FROM comments WHERE id_sondage='.$connect->Param('numsondage').' ORDER BY id_comment';
$sql = $connect->Prepare($sql);
diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index 1ec1a5f3..7dfd953f 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -87,14 +87,12 @@ class Utils
echo '
<link rel="stylesheet" href="' . self::get_server_name() . 'css/bootstrap.min.css">
- <link rel="stylesheet" href="' . self::get_server_name() . 'css/bootstrap-accessibility.css">
<link rel="stylesheet" href="' . self::get_server_name() . 'css/datepicker3.css">
<link rel="stylesheet" href="' . self::get_server_name() . 'css/style.css">
<link rel="stylesheet" href="' . self::get_server_name() . 'css/frama.css">
<link rel="stylesheet" href="' . self::get_server_name() . 'css/print.css" media="print">
<script type="text/javascript" src="' . self::get_server_name() . 'js/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
- <script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-accessibility.min.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.'.$lang.'.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/core.js"></script>';
diff --git a/app/inc/config.inc.php b/app/inc/config.inc.php
deleted file mode 100644
index 542d01ad..00000000
--- a/app/inc/config.inc.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * This software is governed by the CeCILL-B license. If a copy of this license
- * is not distributed with this file, you can obtain one at
- * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
- *
- * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
- * Authors of Framadate/OpenSondate: Framasoft (https://git.framasoft.org/framasoft/framadate)
- *
- * =============================
- *
- * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
- * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
- * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
- *
- * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
- * Auteurs de Framadate/OpenSondage : Framasoft (https://git.framasoft.org/framasoft/framadate)
- */
-
- /**
- * general configuration
- */
-
- //use email for polls creation/modification/responses notification
- $use_smtp = true;
-
- /**
- * index.php
- */
-
- //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 = 30;
-
- //user can add link or URL when creating his poll.
- $user_can_add_link_or_url = true;
diff --git a/app/inc/constants.php.template b/app/inc/constants.php.template
index 8e043dab..82567d63 100644
--- a/app/inc/constants.php.template
+++ b/app/inc/constants.php.template
@@ -83,3 +83,18 @@ const NO_POLL_ID = 0x0001000000;
const INVALID_EMAIL = 0x0010000000;
const TITLE_EMPTY = 0x0100000000;
const INVALID_DATE = 0x1000000000;
+
+// Config
+$config = [
+ /* general config */
+ 'use_smtp' => true, // use email for polls creation/modification/responses notification
+ /* home */
+ 'show_what_is_that' => true, // display "how to use" section
+ 'show_the_software' => true, // display technical information about the software
+ 'show_cultivate_your_garden' => true, // display "developpement and administration" information
+ /* choix_autre.php / choix_date.php */
+ 'default_poll_duration' => 180, // default values for the new poll duration (number of days).
+ /* choix_autre.php */
+ 'user_can_add_img_or_link' => true, // user can add link or URL when creating his poll.
+];
+
diff --git a/app/inc/functions.inc.php b/app/inc/functions.inc.php
deleted file mode 100644
index 28c50254..00000000
--- a/app/inc/functions.inc.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * This software is governed by the CeCILL-B license. If a copy of this license
- * is not distributed with this file, you can obtain one at
- * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
- *
- * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
- * Authors of Framadate/OpenSondate: Framasoft (https://git.framasoft.org/framasoft/framadate)
- *
- * =============================
- *
- * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
- * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
- * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
- *
- * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
- * Auteurs de Framadate/OpenSondage : Framasoft (https://git.framasoft.org/framasoft/framadate)
- */
- function config_get($p_option){
- include('config.inc.php');
- if (isset(${$p_option})){
- return ${$p_option};
- }
- }
\ No newline at end of file
diff --git a/app/inc/i18n.php b/app/inc/i18n.php
index f5cff48d..0986b292 100644
--- a/app/inc/i18n.php
+++ b/app/inc/i18n.php
@@ -17,6 +17,8 @@
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
+asort($ALLOWED_LANGUAGES);
+
if (isset($_POST['lang']) && is_string($_POST['lang']) && in_array($_POST['lang'], array_keys($ALLOWED_LANGUAGES)) ) {
$mlocale = $_POST['lang'] ;
setcookie('lang' , $_POST['lang'], time()+60*5);
@@ -52,3 +54,15 @@ $_SESSION['langue'] = strtoupper($a[0]);
/* <html lang="$lang"> */
$lang = ($_SESSION['langue']!='') ? strtolower($_SESSION['langue']) : 'fr';
+
+/* Date Format */
+$date_format['txt_full'] = _("%A, den %e. %B %Y"); //summary in choix_date.php and removal date in choix_(date|autre).php
+$date_format['txt_short'] = "%A %e %B %Y"; // radio title
+$date_format['txt_day'] = "%a %e";
+if (strtoupper(substr(PHP_OS,0,3))=='WIN'){ //%e can't be used on Windows platform, use %#d instead
+ foreach($date_format as $k => $v) {
+ $date_format[$k] = preg_replace('#(?<!%)((?:%%)*)%e#','\1%#d', $v); //replace %e by %#d for windows
+ }
+}
+
+
diff --git a/app/inc/init.php b/app/inc/init.php
index 62890bdb..2a13d2b2 100644
--- a/app/inc/init.php
+++ b/app/inc/init.php
@@ -25,7 +25,6 @@ require_once __DIR__ . '/../../vendor/autoload.php';
include_once __DIR__ . '/constants.php';
include_once __DIR__ . '/i18n.php';
-include_once __DIR__ . '/functions.inc.php';
$connect = NewADOConnection(BASE_TYPE);
$connect->Connect(SERVEURBASE, USERBASE, USERPASSWD, BASE);
diff --git a/bandeaux.php b/bandeaux.php
index dd2e1d35..efbe7263 100644
--- a/bandeaux.php
+++ b/bandeaux.php
@@ -23,12 +23,12 @@ include_once __DIR__ . '/app/inc/init.php';
// bandeaux de titre
function bandeau_titre($titre)
{
- global $ALLOWED_LANGUAGES;
+ global $ALLOWED_LANGUAGES;
$img = ( IMAGE_TITRE ) ? '<img src="'. Utils::get_server_name(). IMAGE_TITRE. '" alt="'.NOMAPPLICATION.'">' : '';
echo '
<header role="banner">';
- if(count($ALLOWED_LANGUAGES)>1){
- echo '<form method="post" action="#">
+ if(count($ALLOWED_LANGUAGES)>1){
+ echo '<form method="post" action="#">
<div class="input-group input-group-sm pull-right col-md-2 col-xs-4">
<select name="lang" class="form-control" title="'. _("Select the language") .'" >' . liste_lang() . '</select>
<span class="input-group-btn">
@@ -36,11 +36,11 @@ function bandeau_titre($titre)
</span>
</div>
</form>';
- }
+ }
echo '
- <h1><a href="'.str_replace('/admin','', Utils::get_server_name()).'" title="'._("Home").' - '.NOMAPPLICATION.'">'.$img.'</a></h1>
+ <h1><a href="'.str_replace('/admin','', Utils::get_server_name()).'" title="'._("Home").' - '.NOMAPPLICATION.'">'.$img.'</a></h1>
<h2 class="lead"><i>'. $titre .'</i></h2>
- <hr class="trait" />
+ <hr class="trait" role="presentation" />
</header>
<main role="main">';
}
diff --git a/choix_autre.php b/choix_autre.php
index b44b546d..978ba667 100644
--- a/choix_autre.php
+++ b/choix_autre.php
@@ -28,7 +28,7 @@ if (file_exists('bandeaux_local.php')) {
}
// Step 1/3 : error if $_SESSION from info_sondage are not valid
-if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmpty('nom', $_SESSION) === false || ((config_get('use_smtp')) ? Utils::issetAndNoEmpty('adresse', $_SESSION) === false : false)) {
+if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmpty('nom', $_SESSION) === false || (($config['use_smtp']) ? Utils::issetAndNoEmpty('adresse', $_SESSION) === false : false)) {
Utils::print_header ( _("Error!") );
bandeau_titre(_("Error!"));
@@ -67,7 +67,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
}
}
}
-
+
//format du sondage AUTRE
$_SESSION["formatsondage"]="A".$_SESSION["studsplus"];
@@ -91,15 +91,11 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
Utils::print_header ( _("Removal date and confirmation (3 on 3)") );
bandeau_titre(_("Removal date and confirmation (3 on 3)"));
- // Expiration date is initialised with config parameter. Value will be modified in step 4 if user has defined an other date
- $_SESSION["champdatefin"]= time()+ (86400 * config_get('default_poll_duration')); //60 secondes * 60 minutes * 24 heures * config
+ // Expiration date is initialised with config parameter. Value will be modified in step 4 if user has defined an other date
+ $_SESSION["champdatefin"]= time()+ (86400 * $config['default_poll_duration']); //60 sec * 60 min * 24 hours * config
+
+ $removal_date= strftime($date_format['txt_full'], ($_SESSION["champdatefin"]));//textual date
- $date_format = _("%A, den %e. %B %Y"); //locale replacement
- if (strtoupper(substr(PHP_OS,0,3))=='WIN'){ //%e can't be used on Windows platform, use %#d instead
- $date_format = preg_replace('#(?<!%)((?:%%)*)%e#','\1%#d', $date_format); //replace %e by %#d for windows
- }
- $removal_date="(".strftime($date_format, ($_SESSION["champdatefin"])).")";//textual date
-
// Summary
$summary = '<ol>';
for ($i=0;$i<count($_SESSION['choices']);$i++) {
@@ -142,7 +138,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
'. $summary .'
</div>
<div class="alert alert-info">
- <p>' . _("Your poll will be automatically removed after"). " " . config_get('default_poll_duration') . " " . _("days") . ' <strong>'.$removal_date.'</strong>.<br />' . _("You can fix another removal date for it.") .'</p>
+ <p>' . _("Your poll will be automatically removed after"). " " . $config['default_poll_duration'] . " " . _("days") . ': <strong>'.$removal_date.'</strong>.<br />' . _("You can fix another removal date for it.") .'</p>
<div class="form-group">
<label for="champdatefin" class="col-sm-5 control-label">'. _("Removal date (optional)") .'</label>
<div class="col-sm-6">
@@ -155,8 +151,12 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
</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>' . _("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>'. _("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>';
+ }
+ echo '
</div>
<p class="text-right">
<button class="btn btn-default" onclick="javascript:window.history.back();" title="'. _('Back to step 2') . '">'. _('Back') . '</button>
@@ -181,9 +181,9 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
<div class="alert alert-info">
<p>'. _("To make a generic poll you need to propose at least two choices between differents subjects.") .'</p>
<p>'. _("You can add or remove additional choices with the buttons") .' <span class="glyphicon glyphicon-minus text-info"></span><span class="sr-only">'. _("Remove") .'</span> <span class="glyphicon glyphicon-plus text-success"></span><span class="sr-only">'. _("Add") .'</span></p>';
- if(config_get('user_can_add_link_or_url')){
+ if($config['user_can_add_img_or_link']){
echo ' <p>'. _("It's possible to propose links or images by using "). '<a href="http://'.$lang.'.wikipedia.org/wiki/Markdown">'. _("the Markdown syntax") .'</a>.</p>';
- }
+ }
echo ' </div>'."\n";
// Fields choices : 5 by default
@@ -195,11 +195,11 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
<label for="choice'.$i.'" class="col-sm-2 control-label">'. _("Choice") .' '.($i+1).'</label>
<div class="col-sm-10 input-group">
<input type="text" class="form-control" name="choices[]" size="40" value="'.$choice_value.'" id="choice'.$i.'" />';
- if(config_get('user_can_add_link_or_url')){
- echo '<span class="input-group-addon btn-link md-a-img" title="'. _("Add a link or an image") .' - '. _("Choice") .' '.($i+1).'" ><span class="glyphicon glyphicon-picture"></span>Â <span class="glyphicon glyphicon-link"></span></span>';
- }
+ if($config['user_can_add_img_or_link']){
+ echo '<span class="input-group-addon btn-link md-a-img" title="'. _("Add a link or an image") .' - '. _("Choice") .' '.($i+1).'" ><span class="glyphicon glyphicon-picture"></span>Â <span class="glyphicon glyphicon-link"></span></span>';
+ }
echo '
- </div>
+ </div>
</div>'."\n";
}
@@ -221,7 +221,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">'. _('Close') . '</span></button>
- <h4 class="modal-title" id="md-a-imgModalLabel">'. _("Add a link or an image") .'</h4>
+ <p class="modal-title" id="md-a-imgModalLabel">'. _("Add a link or an image") .'</p>
</div>
<div class="modal-body">
<p class="alert alert-info">'. _("These fields are optional. You can add a link, an image or both.") .'</p>
diff --git a/choix_date.php b/choix_date.php
index dcb9b1d7..0531b4ed 100644
--- a/choix_date.php
+++ b/choix_date.php
@@ -76,7 +76,7 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
$_SESSION["toutchoix"]=substr($choixdate,1);
// Expiration date → 6 months after last day if not filled or in bad format
- $_SESSION["champdatefin"]=end($temp_results)+15552000;
+ $_SESSION["champdatefin"]=end($temp_results)+(86400 * $config['default_poll_duration']);
if (Utils::issetAndNoEmpty('champdatefin')) {
$registredate = explode("/",$_POST["champdatefin"]);
@@ -124,12 +124,12 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
$temp_array = array_unique($_SESSION["totalchoixjour"]);
sort($temp_array);
- $removal_date=strftime(_("%A, den %e. %B %Y"), end($temp_array)+15552000);
+ $removal_date=strftime($date_format['txt_full'], end($temp_array)+ (86400 * $config['default_poll_duration']));
// Sumary
$summary = '<ul>';
for ($i=0;$i<count($_SESSION["totalchoixjour"]);$i++) {
- $summary .= '<li>'.strftime(_("%A, den %e. %B %Y"), $_SESSION["totalchoixjour"][$i]);
+ $summary .= '<li>'.strftime($date_format['txt_full'], $_SESSION["totalchoixjour"][$i]);
for ($j=0;$j<count($_SESSION['horaires'.$i]);$j++) {
if (isset($_SESSION['horaires'.$i][$j])) {
$summary .= ($j==0) ? ' : ' : ', ';
@@ -150,7 +150,7 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
'. $summary .'
</div>
<div class="alert alert-info clearfix">
- <p>' . _("Your poll will be automatically removed 6 months after the last date of your poll:") . ' <strong>'.$removal_date.'</strong>.<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:") . ' <strong>'.$removal_date.'</strong>.<br />' . _("You can fix another removal date for it.") .'</p>
<div class="form-group">
<label for="champdatefin" class="col-sm-5 control-label">'. _("Removal date (optional)") .'</label>
<div class="col-sm-6">
@@ -163,8 +163,12 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
</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>' . _("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>'. _("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>';
+ }
+ echo '
</div>
<p class="text-right">
<button class="btn btn-default" onclick="javascript:window.history.back();" title="'. _('Back to step 2') . '">'. _('Back') . '</button>
@@ -200,6 +204,7 @@ if (!Utils::issetAndNoEmpty('nom', $_SESSION) && !Utils::issetAndNoEmpty('adress
<fieldset>
<div class="form-group">
<legend>
+ <label class="sr-only" for="day'.$i.'">'. _("Day") .' '. ($i+1) .'</label>
<div class="input-group date col-xs-7">
<span class="input-group-addon"><i class="glyphicon glyphicon-calendar text-info"></i></span>
<input type="text" class="form-control" id="day'.$i.'" title="'. _("Day") .' '. ($i+1) .'" data-date-format="'. _("dd/mm/yyyy") .'" aria-describedby="dateformat'.$i.'" name="days[]" value="'.$day_value.'" size="10" maxlength="10" placeholder="'. _("dd/mm/yyyy") .'" />
diff --git a/creation_sondage.php b/creation_sondage.php
index 6d9921c3..1e7f982a 100644
--- a/creation_sondage.php
+++ b/creation_sondage.php
@@ -45,9 +45,8 @@ function ajouter_sondage()
$sondage=random(16);
$sondage_admin=$sondage.random(8);
- //$date_fin = ($_SESSION["champdatefin"]) ? $_SESSION["champdatefin"] : $date_fin=time()+ (86400 * config_get('default_poll_duration'));
- $date_fin = $_SESSION["champdatefin"]; //always provided by choix_autre.php
- $_SESSION["champdatefin"]=""; //clean param cause 2 polls created by the same user in the same session can be affected by this param during the 2nd creation.
+ $date_fin = $_SESSION["champdatefin"]; // provided by choix_autre.php or choix_date.php
+ $_SESSION["champdatefin"]=""; //clean param cause 2 polls created by the same user in the same session can be affected by this param during the 2nd creation.
$sql = 'INSERT INTO sondage
(id_sondage, commentaires, mail_admin, nom_admin, titre, id_sondage_admin, date_fin, format, mailsonde)
VALUES (
@@ -68,23 +67,23 @@ function ajouter_sondage()
$sql = $connect->Prepare($sql);
$connect->Execute($sql, array($sondage, $_SESSION['toutchoix']));
- if(config_get('use_smtp')==true){
- $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.");
- $message .= "\n\n";
- $message .= stripslashes(html_entity_decode($_SESSION["nom"],ENT_QUOTES,"UTF-8"))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n";
- $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION;
+ if($config['use_smtp']==true){
+ $message = _("This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.");
+ $message .= "\n\n";
+ $message .= stripslashes(html_entity_decode($_SESSION["nom"],ENT_QUOTES,"UTF-8"))." " . _("hast just created a poll called") . " : \"".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES))."\".\n";
+ $message .= _("Thanks for filling the poll at the link above") . " :\n\n%s\n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION;
- $message_admin = _("This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above");
- $message_admin .= " :\n\n"."%s \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION;
+ $message_admin = _("This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above");
+ $message_admin .= " :\n\n"."%s \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION;
- $message = sprintf($message, Utils::getUrlSondage($sondage));
- $message_admin = sprintf($message_admin, Utils::getUrlSondage($sondage_admin, true));
+ $message = sprintf($message, Utils::getUrlSondage($sondage));
+ $message_admin = sprintf($message_admin, Utils::getUrlSondage($sondage_admin, true));
- if (Utils::isValidEmail($_SESSION['adresse'])) {
- Utils::sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $_SESSION['adresse'] );
- Utils::sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $_SESSION['adresse'] );
- }
- }
+ if (Utils::isValidEmail($_SESSION['adresse'])) {
+ Utils::sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message_admin, $_SESSION['adresse'] );
+ Utils::sendEmail( "$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes(htmlspecialchars_decode($_SESSION["titre"],ENT_QUOTES)), $message, $_SESSION['adresse'] );
+ }
+ }
error_log(date('H:i:s d/m/Y:') . ' CREATION: '.$sondage."\t".$_SESSION[formatsondage]."\t".$_SESSION[nom]."\t".$_SESSION[adresse]."\t \t".$_SESSION[toutchoix]."\n", 3, 'admin/logs_studs.txt');
Utils::cleaning_polls($connect, 'admin/logs_studs.txt');
diff --git a/css/style.css b/css/style.css
index 3d480912..f22af140 100644
--- a/css/style.css
+++ b/css/style.css
@@ -44,8 +44,6 @@ div.comment{
padding-left: 14px;
}
-/* Ajouts après mise en place de Bootstrap */
-
/* Règles générales */
a:focus { /* a11y */
@@ -77,6 +75,10 @@ main, header, footer, .container .jumbotron {
opacity: 1;
}
+.home-choice {
+ margin-bottom:50px;
+}
+
/* Description du sondage */
/* studs.php et adminstuds.php */
header .lead {
@@ -115,7 +117,7 @@ caption {
}
/* adminstuds.php */
-#title-form h2 .btn-edit,
+#title-form h3 .btn-edit,
#email-form .btn-edit,
#description-form .btn-edit,
#poll-rules-form .btn-edit {
@@ -338,3 +340,7 @@ table.results .btn-link.btn-sm {
#md-a-imgModal .form-group {
margin:10px 0px;
}
+
+#md-a-imgModalLabel {
+ font-size: 24px;
+}
diff --git a/index.php b/index.php
index 14361fcd..6fed0097 100644
--- a/index.php
+++ b/index.php
@@ -37,31 +37,30 @@ bandeau_titre(_("Make your polls"));
echo '
<div class="row">
<div class="col-md-6 text-center">
- <p><a href="'.Utils::get_server_name().'infos_sondage.php?choix_sondage=date" class="opacity" role="button">
+ <p class="home-choice"><a href="'.Utils::get_server_name().'infos_sondage.php?choix_sondage=date" class="opacity" role="button">
<img class="img-responsive center-block" src="'.Utils::get_server_name().'images/date.png" alt="" />
<br /><span class="btn btn-primary btn-lg"><span class="glyphicon glyphicon-calendar"></span>
'. _('Schedule an event') . '</span>
</a></p>
</div>
<div class="col-md-6 text-center">
- <p><a href="'.Utils::get_server_name().'infos_sondage.php?choix_sondage=autre" class="opacity" role="button">
+ <p class="home-choice"><a href="'.Utils::get_server_name().'infos_sondage.php?choix_sondage=autre" class="opacity" role="button">
<img alt="" class="img-responsive center-block" src="'.Utils::get_server_name().'images/classic.png" />
<br /><span class="btn btn-info btn-lg"><span class="glyphicon glyphicon-stats"></span>
'. _('Make a classic poll') . '</span>
</a></p>
</div>
</div>
- <hr />
+ <hr role="presentation" />
<div class="row">';
- $nbcol = config_get('show_what_is_that') + config_get('show_the_software') + config_get('show_cultivate_your_garden');
- if ($nbcol > 0){
- $colmd = 12/$nbcol; // 3 =>col-md-4, 2 =>col-md-6, 1 =>col-md-12.
- //echo "mon test : ".$nbActivation;
- }
- if(config_get('show_what_is_that') == true){
- echo '<div class="col-md-'.$colmd.'">
+ $nbcol = $config['show_what_is_that'] + $config['show_the_software'] + $config['show_cultivate_your_garden'];
+ if ($nbcol > 0){
+ $colmd = 12/$nbcol; // 3 =>col-md-4, 2 =>col-md-6, 1 =>col-md-12.
+ }
+ if($config['show_what_is_that'] == true){
+ echo '<div class="col-md-'.$colmd.'">
<h3>'. _('What is that?') . '</h3>
- <p class="text-center"><span class="glyphicon glyphicon-question-sign" style="font-size:50px"></span></p>
+ <p class="text-center" role="presentation"><span class="glyphicon glyphicon-question-sign" style="font-size:50px"></span></p>
<p>'. _('Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.') .'</p>
<p>'. _('Here is how it works:') . '</p>
<ol>
@@ -71,13 +70,13 @@ echo '
<li>'. _('Discuss and make a decision') . '</li>
</ol>
<p>'. _('Do you want to ') . '<a href="' . Utils::getUrlSondage('aqg259dth55iuhwm').'">'. _("view an example?") .'</a></p>
- </div>';
- }
-
- if(config_get('show_the_software') == true){
- echo '<div class="col-md-'.$colmd.'">
+ </div>';
+ }
+
+ if($config['show_the_software'] == true){
+ echo '<div class="col-md-'.$colmd.'">
<h3>'. _('The software') .'</h3>
- <p class="text-center"><span class="glyphicon glyphicon-cloud" style="font-size:50px"></span></p>
+ <p class="text-center" role="presentation"><span class="glyphicon glyphicon-cloud" style="font-size:50px"></span></p>
<p>'. _('Framadate was initially based on '). '<a href="https://sourcesup.cru.fr/projects/studs/">Studs</a>'. _(' a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft') .'.</p>
<p>'. _('This software needs javascript and cookies enabled. It is compatible with the following web browsers:') .'</p>
<ul>
@@ -88,19 +87,19 @@ echo '
<li>Opera 11+</li>
</ul>
<p>'. _('It is governed by the ').'<a href="http://www.cecill.info">'. _('CeCILL-B license').'</a>.</p>
- </div>';
- }
-
- if(config_get('show_cultivate_your_garden') == true){
- echo '<div class="col-md-'.$colmd.'">
+ </div>';
+ }
+
+ if($config['show_cultivate_your_garden'] == true){
+ echo '<div class="col-md-'.$colmd.'">
<h3>'. _('Cultivate your garden') .'</h3>
- <p class="text-center"><span class="glyphicon glyphicon-tree-deciduous" style="font-size:50px"></span></p>
+ <p class="text-center" role="presentation"><span class="glyphicon glyphicon-tree-deciduous" style="font-size:50px"></span></p>
<p>'. _('To participate in the software development, suggest improvements or simply download it, please visit ') .'<a href="https://git.framasoft.org/framasoft/framadate">'._('the development site').'</a>.</p>
<br />
<p>'. _('If you want to install the software for your own use and thus increase your independence, we help you on:') .'</p>
<p class="text-center"><a href="http://framacloud.org/cultiver-son-jardin/installation-de-framadate/" class="btn btn-success"><span class="glyphicon glyphicon-tree-deciduous"></span> framacloud.org</a></p>
- </div>';
- }
+ </div>';
+ }
echo '</div>'."\n";
bandeau_pied();
diff --git a/infos_sondage.php b/infos_sondage.php
index 2bb36fe4..59d58481 100644
--- a/infos_sondage.php
+++ b/infos_sondage.php
@@ -77,11 +77,11 @@ if (Utils::issetAndNoEmpty("poursuivre")){
unset($_SESSION["mailsonde"]);
$_SESSION["mailsonde"] = ($mailsonde !== null) ? true : false;
- if (config_get('use_smtp')==true){
- if (Utils::isValidEmail($adresse) === false) {
- $erreur_adresse = true;
- }
- }
+ if ($config['use_smtp']==true){
+ if (Utils::isValidEmail($adresse) === false) {
+ $erreur_adresse = true;
+ }
+ }
if (preg_match(';<|>|";',$titre)) {
$erreur_injection_titre = true;
@@ -96,13 +96,12 @@ if (Utils::issetAndNoEmpty("poursuivre")){
}
// Si pas d'erreur dans l'adresse alors on change de page vers date ou autre
- if(config_get('use_smtp')==true){
- $email_OK = $adresse && !$erreur_adresse;
- }
- else{
- $email_OK = true;
- }
-
+ if($config['use_smtp']==true){
+ $email_OK = $adresse && !$erreur_adresse;
+ } else{
+ $email_OK = true;
+ }
+
if ($titre && $nom && $email_OK && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom) {
if ( $poursuivre == "creation_sondage_date" ) {
@@ -188,7 +187,7 @@ if (!$_SESSION["adresse"] && Utils::issetAndNoEmpty("poursuivre")) {
$errors['email']['msg'] = '<div class="alert alert-danger"><p id="poll_email_error">' . _("Enter an email address") . '</p></div>';
} elseif ($erreur_adresse && Utils::issetAndNoEmpty("poursuivre")) {
$errors['email']['aria'] = 'aria-describeby="poll_email_error" '; $errors['email']['class'] = ' has-error';
- $errors['email']['msg'] = '<div class="alert alert-danger"><p id="poll_email_error">' . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . '</p></div>';
+ $errors['email']['msg'] = '<div class="alert alert-danger"><p id="poll_email_error">' . _("The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.") . '</p></div>';
}
/*
@@ -252,18 +251,18 @@ echo '
</div>
</div>
'.$errors['name']['msg'];
- if(config_get('use_smtp')==true){
- echo '
- <div class="form-group'.$errors['email']['class'].'">
- <label for="email" class="col-sm-4 control-label">'. _("Your email address") .' *</label>
- <div class="col-sm-8">
- '.$input_email.'
- </div>
- </div>
- '.$errors['email']['msg'];
- }
-
- echo '<div class="form-group">
+if($config['use_smtp']==true){
+ echo '
+ <div class="form-group'.$errors['email']['class'].'">
+ <label for="email" class="col-sm-4 control-label">'. _("Your email address") .' *<br /><span class="small">'. _("(in the format name@mail.com)") .'</span></label>
+ <div class="col-sm-8">
+ '.$input_email.'
+ </div>
+ </div>
+ '.$errors['email']['msg'];
+}
+echo '
+ <div class="form-group">
<div class="col-sm-offset-1 col-sm-11">
<div class="checkbox">
<label>
@@ -272,19 +271,19 @@ echo '
</div>
</div>
</div>';
- if(config_get('use_smtp')==true){
- echo '<div class="form-group">
- <div class="col-sm-offset-1 col-sm-11">
- <div class="checkbox">
- <label>
- <input type=checkbox name=mailsonde '.$cochemail.' id="mailsonde">'. _("To receive an email for each new vote.") .'
- </label>
- </div>
- </div>
- </div>';
- }
-
- echo '<p class="text-right">
+if($config['use_smtp']==true){
+ echo '<div class="form-group">
+ <div class="col-sm-offset-1 col-sm-11">
+ <div class="checkbox">
+ <label>
+ <input type=checkbox name=mailsonde '.$cochemail.' id="mailsonde">'. _("To receive an email for each new vote.") .'
+ </label>
+ </div>
+ </div>
+ </div>';
+}
+echo '
+ <p class="text-right">
<input type="hidden" name="choix_sondage" value="'. $choix_sondage .'"/>
<button name="poursuivre" value="'. $choix_sondage .'" type="submit" class="btn btn-success" title="'. _('Go to step 2') . '">'. _('Next') . '</button>
</p>
@@ -295,5 +294,4 @@ echo '
</div>
</div>';
-//bandeau de pied
bandeau_pied();
diff --git a/js/core.js b/js/core.js
index 1a160932..5fc67355 100644
--- a/js/core.js
+++ b/js/core.js
@@ -404,12 +404,11 @@ $(document).ready(function() {
// Vote form moving to the top or to the bottom
$(window).scroll(function() {
var $table_offset = $('.results thead').offset();
- if($table_offset != undefined && $(window).scrollTop() < $table_offset.top) {
- $('.results tbody').prepend($('#vote-form'));
- $('#tableContainer').before($('.scroll-buttons'));
- } else {
+ if(($table_offset == undefined || $(window).scrollTop() > $table_offset.top) && ($('table.results').height() > $(window).height())) {
$('#addition').before($('#vote-form'));
$('#tableContainer').after($('.scroll-buttons'));
+ } else {
+ $('.results tbody').prepend($('#vote-form'));
+ $('#tableContainer').before($('.scroll-buttons'));
}
-
});
diff --git a/locale/de_DE/LC_MESSAGES/Studs.mo b/locale/de_DE/LC_MESSAGES/Studs.mo
index 5aa0f96d64ccbd94124de0fc1cdee0a36036f3dc..4311fa75521cbf54a19a609910deeec581fcf19e 100644
GIT binary patch
delta 4446
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
delta 4348
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
diff --git a/locale/de_DE/LC_MESSAGES/Studs.po b/locale/de_DE/LC_MESSAGES/Studs.po
index 46a47e31..ed73b338 100644
--- a/locale/de_DE/LC_MESSAGES/Studs.po
+++ b/locale/de_DE/LC_MESSAGES/Studs.po
@@ -60,6 +60,9 @@ msgstr "Ihr Name"
msgid "Your email address"
msgstr "Ihre E-Mail Addresse"
+msgid "(in the format name@mail.com)"
+msgstr "(in the format name@mail.com)"
+
msgid "Description"
msgstr "Beschreibung"
@@ -428,8 +431,8 @@ msgstr "Die Zeichen < > und \" sind nicht erlaubt !"
msgid "Enter an email address"
msgstr "Sie müssen eine E-Mail Adresse eingeben"
-msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)"
-msgstr "Die Adresse ist nicht korrekt! (Sie sollten eine funktionierende E-Mail Adresse angeben, um den Link zu ihrer Umfrage zu erhalten)"
+msgid "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll."
+msgstr "Die Adresse ist nicht korrekt! Sie sollten eine funktionierende E-Mail Adresse angeben, um den Link zu ihrer Umfrage zu erhalten"
# Error choix_date.php/choix_autre.php
msgid "You haven't filled the first section of the poll creation."
diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo
index 9532f8e64f01172b23be6b990310515e19fe3e52..d4623e0ba7e674c6584a38444feb92f2c73df9b7 100644
GIT binary patch
delta 4602
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
delta 4497
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
diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po
index c2398481..e01b3ab0 100644
--- a/locale/en_GB/LC_MESSAGES/Studs.po
+++ b/locale/en_GB/LC_MESSAGES/Studs.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-23 20:52+0100\n"
"PO-Revision-Date: 2014-11-11 20:12+0100\n"
-"Last-Translator: mrB <mr.bricodage@gmail.com>\n"
+"Last-Translator: JosephK\n"
"Language-Team: JosephK\n"
"Language: English\n"
"MIME-Version: 1.0\n"
@@ -60,6 +60,9 @@ msgstr "Your name"
msgid "Your email address"
msgstr "Your email address"
+msgid "(in the format name@mail.com)"
+msgstr "(in the format name@mail.com)"
+
msgid "Description"
msgstr "Description"
@@ -434,8 +437,8 @@ msgstr "Characters < > and \" are not permitted"
msgid "Enter an email address"
msgstr "Enter an email address"
-msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)"
-msgstr "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)"
+msgid "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll."
+msgstr "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll."
# Error choix_date.php/choix_autre.php
msgid "You haven't filled the first section of the poll creation."
@@ -554,8 +557,11 @@ msgid "Create the poll"
msgstr "Create the poll"
# Step 3 choix_date.php
-msgid "Your poll will be automatically removed 6 months after the last date of your poll:"
-msgstr "Your poll will be automatically removed 6 months after the last date of your poll:"
+msgid "Your poll will be automatically removed "
+msgstr "Your poll will be automatically removed "
+
+msgid " after the last date of your poll:"
+msgstr " after the last date of your poll:"
msgid "Removal date:"
msgstr "Removal date:"
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo
index 3053598a8a96ef2f5cad3cb99b80e471babd507b..006378a3beae041d84ae1719f4184b67d7527cf0 100644
GIT binary patch
delta 4832
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
Jro0x{{{TfIO1c05
delta 4744
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
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po
index c647757b..66aa4fc7 100644
--- a/locale/fr_FR/LC_MESSAGES/Studs.po
+++ b/locale/fr_FR/LC_MESSAGES/Studs.po
@@ -4,7 +4,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-10-23 20:52+0100\n"
"PO-Revision-Date: 2014-11-11 13:19+0100\n"
-"Last-Translator: mrB <mr.bricodage@gmail.com>\n"
+"Last-Translator: JosephK\n"
"Language-Team: JosephK\n"
"Language: French\n"
"MIME-Version: 1.0\n"
@@ -58,7 +58,10 @@ msgid "Your name"
msgstr "Votre nom"
msgid "Your email address"
-msgstr "Votre adresse email"
+msgstr "Votre courriel"
+
+msgid "(in the format name@mail.com)"
+msgstr "(au format nom@mail.com)"
msgid "Description"
msgstr "Description"
@@ -197,16 +200,16 @@ msgid "Initiator of the poll"
msgstr "Auteur du sondage"
msgid "Email"
-msgstr "Adresse email"
+msgstr "Courriel"
msgid "Edit the email adress"
-msgstr "Modifier l'adresse email"
+msgstr "Modifier le courriel"
msgid "Save the email address "
-msgstr "Enregistrer l'adresse email"
+msgstr "Enregistrer le courriel"
msgid "Cancel the email address edit"
-msgstr "Annuler le changement d'adresse email"
+msgstr "Annuler le changement de courriel"
msgid "Edit the description"
msgstr "Modifier la description"
@@ -255,7 +258,7 @@ msgid "and add a new column with "
msgstr "et si vous avez oublié de saisir un choix, vous pouvez rajouter une colonne en cliquant sur "
msgid "Finally, you can change the informations of this poll like the title, the comments or your email address."
-msgstr "Vous pouvez enfin également modifier les informations relatives à ce sondage comme le titre, les commentaires ou encore votre adresse électronique."
+msgstr "Vous pouvez enfin également modifier les informations relatives à ce sondage comme le titre, les commentaires ou encore votre courriel."
# Help text studs.php
msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line."
@@ -419,7 +422,7 @@ msgid "Voters can modify their vote themselves."
msgstr "Vous souhaitez que les sondés puissent modifier leur ligne eux-mêmes."
msgid "To receive an email for each new vote."
-msgstr "Vous souhaitez recevoir un mail à chaque participation d'un sondé."
+msgstr "Vous souhaitez recevoir un courriel à chaque participation d'un sondé."
msgid "Go to step 2"
msgstr "Aller à l'étape 2"
@@ -432,10 +435,10 @@ msgid "Characters < > and \" are not permitted"
msgstr "Les caractères < > et \" ne sont pas autorisés !"
msgid "Enter an email address"
-msgstr "Il faut saisir une adresse email !"
+msgstr "Il faut saisir une adresse électronique !"
-msgid "The address is not correct! (You should enter a valid email address in order to receive the link to your poll)"
-msgstr "L'adresse saisie n'est pas correcte ! (Il faut une adresse valide pour recevoir le lien vers le sondage)"
+msgid "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll."
+msgstr "L'adresse saisie n'est pas correcte ! Il faut une adresse électronique valide (par exemple r.stallman@outlock.com) pour recevoir le lien vers le sondage."
# Error choix_date.php/choix_autre.php
msgid "You haven't filled the first section of the poll creation."
@@ -468,16 +471,16 @@ msgid "Time"
msgstr "Horaire"
msgid "Remove an hour"
-msgstr "Supprimer un horaire"
+msgstr "Supprimer le dernier horaire"
msgid "Add an hour"
msgstr "Ajouter un horaire"
msgid "Copy hours of the first day"
-msgstr "Reporter les horaires du premier jour"
+msgstr "Reporter les horaires du premier jour sur les autres jours"
msgid "Remove a day"
-msgstr "Supprimer un jour"
+msgstr "Supprimer le dernier jour"
msgid "Add a day"
msgstr "Ajouter un jour"
@@ -523,7 +526,7 @@ msgid "Alternative text"
msgstr "Texte alternatif"
msgid "Remove a choice"
-msgstr "Supprimer un choix"
+msgstr "Supprimer le dernier choix"
msgid "Add a choice"
msgstr "Ajouter un choix"
@@ -548,14 +551,17 @@ msgid "Once you have confirmed the creation of your poll, you will be automatica
msgstr "Une fois que vous aurez confirmé la création du sondage, vous serez redirigé automatiquement vers la page d'administration de votre sondage."
msgid "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."
-msgstr "En même temps, vous recevrez deux emails : l'un contenant le lien vers votre sondage pour le faire suivre aux futurs sondés, l'autre contenant le lien vers la page d'administraion du sondage."
+msgstr "En même temps, vous recevrez deux courriels : l'un contenant le lien vers votre sondage pour le faire suivre aux futurs sondés, l'autre contenant le lien vers la page d'administraion du sondage."
msgid "Create the poll"
msgstr "Créer le sondage"
# Step 3 choix_date.php
-msgid "Your poll will be automatically removed 6 months after the last date of your poll:"
-msgstr "Votre sondage sera automatiquement effacé 6 mois après la date la plus tardive :"
+msgid "Your poll will be automatically removed "
+msgstr "Votre sondage sera automatiquement effacé "
+
+msgid " after the last date of your poll:"
+msgstr " après la date la plus tardive :"
msgid "Removal date:"
msgstr "Date de suppression :"
@@ -604,13 +610,9 @@ msgstr "Voir le sondage"
msgid "Change the poll"
msgstr "Modifier le sondage"
-# Footer
msgid "Logs"
msgstr "Historique"
-msgid "Cleaning"
-msgstr "Nettoyage"
-
########### Mails ###########
# Mails studs.php
msgid "Poll's participation"
diff --git a/studs.php b/studs.php
index cd999aec..e0ad8e75 100644
--- a/studs.php
+++ b/studs.php
@@ -173,15 +173,15 @@ if (!Utils::is_error(NO_POLL) && (isset($_POST["boutonp"]))) {
$connect->Execute($sql, array($nom, $numsondage, $nouveauchoix));
if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") {
- if(config_get('use_smtp')==true){
- Utils::sendEmail( "$dsondage->mail_admin",
- "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."",
- html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8').
- _("has filled a line.\nYou can find your poll at the link") . " :\n\n".
- Utils::getUrlSondage($numsondage) . " \n\n" .
- _("Thanks for your confidence.") . "\n". NOMAPPLICATION );
- }
- }
+ if($config['use_smtp']==true){
+ Utils::sendEmail( "$dsondage->mail_admin",
+ "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."",
+ html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8').
+ _("has filled a line.\nYou can find your poll at the link") . " :\n\n".
+ Utils::getUrlSondage($numsondage) . " \n\n" .
+ _("Thanks for your confidence.") . "\n". NOMAPPLICATION );
+ }
+ }
}
} else {
$err |= NAME_EMPTY;
@@ -335,7 +335,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+"||$dsondage->format=="D-") {
$current = $toutsujet[$i];
$border[$i] = false;
- $radio_title[$i] = strftime("%A %e %B %Y",$current);
+ $radio_title[$i] = strftime($date_format['txt_short'],$current);
// Months
$td_headers[$i] = 'M'.($i+1-$colspan_month);
@@ -351,11 +351,11 @@ if ($dsondage->format=="D"||$dsondage->format=="D+"||$dsondage->format=="D-") {
// Days
$td_headers[$i] .= ' D'.($i+1-$colspan_day);
- if (isset($toutsujet[$i+1]) && strftime("%a %e",$current)==strftime("%a %e",$toutsujet[$i+1])&&strftime("%B",$current)==strftime("%B",$toutsujet[$i+1])){
+ if (isset($toutsujet[$i+1]) && strftime($date_format['txt_day'],$current)==strftime($date_format['txt_day'],$toutsujet[$i+1])&&strftime("%B",$current)==strftime("%B",$toutsujet[$i+1])){
$colspan_day++;
} else {
$rbd = ($border[$i]) ? ' rbd' : '';
- $tr_days .= '<th colspan="'.$colspan_day.'" class="bg-primary day'.$rbd.'" id="D'.($i+1-$colspan_day).'">'.strftime("%a %e",$current).'</th>';
+ $tr_days .= '<th colspan="'.$colspan_day.'" class="bg-primary day'.$rbd.'" id="D'.($i+1-$colspan_day).'">'.strftime($date_format['txt_day'],$current).'</th>';
$colspan_day=1;
}
@@ -439,13 +439,13 @@ if ($dsondage->format=="A-" || $dsondage->format=="D-") {
echo '
<div class="alert alert-danger">
<p>' . _("The administrator locked this poll, votes and comments are frozen, it's not possible to participate anymore.") . '</p>
- <p><b>' . _('Legend:'). '</b> <span class="glyphicon glyphicon-ok"></span> =' . _('Yes') . ', <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = ' . _('Ifneedbe') . ', <span class="glyphicon glyphicon-ban-circle"></span> = ' . _('No') . '</p>
+ <p aria-hidden="true"><b>' . _('Legend:'). '</b> <span class="glyphicon glyphicon-ok"></span> =' . _('Yes') . ', <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = ' . _('Ifneedbe') . ', <span class="glyphicon glyphicon-ban-circle"></span> = ' . _('No') . '</p>
</div>';
} else {
echo '
<div class="alert alert-info">
<p>' . _("If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.") . '</p>
- <p><b>' . _('Legend:'). '</b> <span class="glyphicon glyphicon-ok"></span> =' . _('Yes') . ', <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = ' . _('Ifneedbe') . ', <span class="glyphicon glyphicon-ban-circle"></span> = ' . _('No') . '</p>
+ <p aria-hidden="true"><b>' . _('Legend:'). '</b> <span class="glyphicon glyphicon-ok"></span> =' . _('Yes') . ', <b>(<span class="glyphicon glyphicon-ok"></span>)</b> = ' . _('Ifneedbe') . ', <span class="glyphicon glyphicon-ban-circle"></span> = ' . _('No') . '</p>
</div>';
}
echo'
@@ -557,7 +557,7 @@ while ($data = $user_studs->FetchNextObject(false)) {
for ($i=0;$i<$nblignes;$i++) {
if (isset($_POST["modifierligne$i"])) {
if ($compteur == $i) {
- echo '<td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="validermodifier'.$compteur.'" title="'. _('Save the choices:') .' '.stripslashes($nombase).'">'. _('Save') .'</button></td>'."\n";
+ echo '<td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="validermodifier'.$compteur.'" title="'. _('Save the choices') .' '.stripslashes($nombase).'">'. _('Save') .'</button></td>'."\n";
}
}
}
@@ -662,7 +662,7 @@ if ($compteursujet == 1) {
echo '
</div>
- <hr />';
+ <hr role="presentation" />';
// Comments
$sql = 'select * from comments where id_sondage='.$connect->Param('numsondage').' order by id_comment';
--
GitLab