lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved translation of opensurvey module

Browse Source
This commit is contained in:
Marcos García de La Fuente 2014-01-03 15:27:26 +01:00
parent 32ca1b8881
commit dd7be996c2
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/errors.lang
View File

@ -127,6 +127,7 @@ ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setu
ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature. ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
ErrorWarehouseMustDiffers=Source and target warehouses must differs ErrorWarehouseMustDiffers=Source and target warehouses must differs
ErrorBadFormat=Bad format!
# Warnings # Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined

8
htdocs/langs/en_US/opensurvey.lang
View File

@ -44,6 +44,8 @@ PourContreList=List (empty/for/against)
AddNewColumn=Add new column AddNewColumn=Add new column
TitleChoice=Choice label TitleChoice=Choice label
InfoAfterCreate=Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.<br>You should also receive an email with link to your poll for sending it to the voters. InfoAfterCreate=Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll.<br>You should also receive an email with link to your poll for sending it to the voters.
InfoExpiration=Your poll will be automatically removed after 6 months.<br> You can fix another removal date for it.
RemovalDate=Removal date (optional)
ExportSpreadsheet=Export result spreadsheet ExportSpreadsheet=Export result spreadsheet
ExpireDate=Limit date ExpireDate=Limit date
NbOfVoters=Nb of voters NbOfVoters=Nb of voters
@ -67,3 +69,9 @@ CanEditVotes=Can change vote of others
SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
BackToCurrentMonth=Back to current month BackToCurrentMonth=Back to current month
PublicLinkToCreateSurvey=Public link to allow everybody to create a survey PublicLinkToCreateSurvey=Public link to allow everybody to create a survey
ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
ErrorOpenSurveyOneChoice=Enter at least one choice
ErrorOpenSurveyDateFormat=Date must be have the format DD/MM/YYYY
ErrorOpenSurveyInvalidChars=Characters \" < and > are not permitted
MoreChoices=Enter more choices for the voters
AfterCreationInfo=Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll. <br>Then, you will receive quickly an email contening the link to your poll for sending it to the voters.

12
htdocs/opensurvey/public/choix_autre.php
View File

@ -125,7 +125,7 @@ llxHeaderSurvey($langs->trans("OpenSurvey"), "", 0, 0, $arrayofjs, $arrayofcss);
if (empty($_SESSION['titre']) || empty($_SESSION['nom']) || empty($_SESSION['adresse'])) if (empty($_SESSION['titre']) || empty($_SESSION['nom']) || empty($_SESSION['adresse']))
{ {
dol_print_error('',"You haven't filled the first section of the poll creation"); dol_print_error('', $langs->trans('ErrorOpenSurveyFillFirstSection'));
llxFooterSurvey(); llxFooterSurvey();
exit; exit;
} }
@ -179,25 +179,25 @@ for ($i=0;$i<$_SESSION["nbrecases"];$i++)
//message d'erreur si aucun champ renseigné //message d'erreur si aucun champ renseigné
if ($testremplissage != "ok" && (isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"]))) { if ($testremplissage != "ok" && (isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"]))) {
print "<br><font color=\"#FF0000\">" . $langs->trans("Enter at least one choice") . "</font><br><br>"."\n"; print "<br><font color=\"#FF0000\">" . $langs->trans("ErrorOpenSurveyOneChoice") . "</font><br><br>"."\n";
$erreur = true; $erreur = true;
} }
//message d'erreur si mauvaise date //message d'erreur si mauvaise date
if ($testdate === false) { if ($testdate === false) {
print "<br><font color=\"#FF0000\">" . _("Date must be have the format DD/MM/YYYY") . "</font><br><br>"."\n"; print "<br><font color=\"#FF0000\">" . $langs->trans("ErrorOpenSurveyDateFormat") . "</font><br><br>"."\n";
} }
if ($erreur_injection) { if ($erreur_injection) {
print "<font color=#FF0000>" . _("Characters \" < and > are not permitted") . "</font><br><br>\n"; print "<font color=#FF0000>" . $langs->trans("ErrorOpenSurveyInvalidChars") . "</font><br><br>\n";
} }
if ((isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"])) && !$erreur && !$erreur_injection) { if ((isset($_POST["fin_sondage_autre"]) || isset($_POST["fin_sondage_autre_x"])) && !$erreur && !$erreur_injection) {
//demande de la date de fin du sondage //demande de la date de fin du sondage
print '<br>'."\n"; print '<br>'."\n";
print '<div class=presentationdatefin>'."\n"; print '<div class=presentationdatefin>'."\n";
print '<br>'. _("Your poll will be automatically removed after 6 months.<br> You can fix another removal date for it.") .'<br><br>'."\n"; print '<br>'. $langs->trans("InfoExpiration") .'<br><br>'."\n";
print _("Removal date (optional)") .' : <input type="text" name="champdatefin" value="'.$date_selected.'" size="10" maxlength="10"> '. _("(DD/MM/YYYY)") ."\n"; print $langs->trans("RemovalDate") .' : <input type="text" name="champdatefin" value="'.$date_selected.'" size="10" maxlength="10"> DD/MM/YYYY';
print '</div>'."\n"; print '</div>'."\n";
print '<div class=presentationdatefin>'."\n"; print '<div class=presentationdatefin>'."\n";
print '<font color=#FF0000>'. $langs->trans("InfoAfterCreate") .'</font>'."\n"; print '<font color=#FF0000>'. $langs->trans("InfoAfterCreate") .'</font>'."\n";

10
htdocs/opensurvey/public/choix_date.php
View File

@ -86,7 +86,7 @@ if (GETPOST('reset')) {
if (! isset($_SESSION['nom']) && ! isset($_SESSION['adresse']) && ! isset($_SESSION['commentaires']) && ! isset($_SESSION['mail'])) if (! isset($_SESSION['nom']) && ! isset($_SESSION['adresse']) && ! isset($_SESSION['commentaires']) && ! isset($_SESSION['mail']))
{ {
dol_print_error('',"You haven't filled the first section of the poll creation"); dol_print_error('', $langs->trans('ErrorOpenSurveyFillFirstSection'));
exit; exit;
} }
@ -542,7 +542,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) && (!issetAndNoEmpty('choixheur
} }
if ($affichageerreurfindeligne) { if ($affichageerreurfindeligne) {
print '<td><b><font color=#FF0000>'. _("Bad format!") .'</font></b></td>'."\n"; print '<td><b><font color=#FF0000>'. $langs->trans("ErrorBadFormat") .'</font></b></td>'."\n";
} }
print '</tr>'."\n"; print '</tr>'."\n";
@ -560,7 +560,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) && (!issetAndNoEmpty('choixheur
//si un seul jour et aucunes horaires choisies, : message d'erreur //si un seul jour et aucunes horaires choisies, : message d'erreur
if ((GETPOST('choixheures') || GETPOST('choixheures_x')) && (count($_SESSION["totalchoixjour"])=="1" && $_POST["horaires0"][0]=="" && $_POST["horaires0"][1]=="" && $_POST["horaires0"][2]=="" && $_POST["horaires0"][3]=="" && $_POST["horaires0"][4]=="")) { if ((GETPOST('choixheures') || GETPOST('choixheures_x')) && (count($_SESSION["totalchoixjour"])=="1" && $_POST["horaires0"][0]=="" && $_POST["horaires0"][1]=="" && $_POST["horaires0"][2]=="" && $_POST["horaires0"][3]=="" && $_POST["horaires0"][4]=="")) {
print '<table><tr><td colspan=3><font color=#FF0000>'. _("Enter more choices for the voters") .'</font><br></td></tr></table>'."\n"; print '<table><tr><td colspan=3><font color=#FF0000>'. $langs->trans("MoreChoices") .'</font><br></td></tr></table>'."\n";
$erreur=true; $erreur=true;
} }
} }
@ -574,14 +574,14 @@ if (!$erreur && (GETPOST('choixheures') || GETPOST('choixheures_x'))) {
print '<br><div class="presentationdatefin">'. $langs->trans("PollWillExpire",2) .'</td></tr><tr><td><br>'. $langs->trans("RemovalDate") .' : <b> '.$date_fin.'</b><br>'."\n"; print '<br><div class="presentationdatefin">'. $langs->trans("PollWillExpire",2) .'</td></tr><tr><td><br>'. $langs->trans("RemovalDate") .' : <b> '.$date_fin.'</b><br>'."\n";
print '</div>'."\n"; print '</div>'."\n";
print '<div class="presentationdatefin">'."\n"; print '<div class="presentationdatefin">'."\n";
print '<font color="#FF0000">'. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll. <br>Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'</font>'."\n"; print '<font color="#FF0000">'. $langs->trans("AfterCreationInfo") .'</font>'."\n";
print'</div>'."\n"; print'</div>'."\n";
// print'<p class=affichageexport>'."\n"; // print'<p class=affichageexport>'."\n";
// print 'Pour finir la cr&eacute;ation du sondage, cliquez sur le bouton <img src="images/add-16.png" alt="ajout"> ci-dessous'."\n"; // print 'Pour finir la cr&eacute;ation du sondage, cliquez sur le bouton <img src="images/add-16.png" alt="ajout"> ci-dessous'."\n";
// print '</p>'."\n"; // print '</p>'."\n";
print '<table>'."\n"; print '<table>'."\n";
print '<tr><td>'. $langs->trans("BackToHoursSetup") .'</td><td></td><td><input type="image" name="retourhoraires" src="images/back-32.png"></td></tr>'."\n"; print '<tr><td>'. $langs->trans("BackToHoursSetup") .'</td><td></td><td><input type="image" name="retourhoraires" src="images/back-32.png"></td></tr>'."\n";
print'<tr><td>'. $langs->trans("CreatePoll") .'</td><td></td><td><input type="image" name="confirmation" value="Valider la cr&eacute;ation" src="images/add.png"></td></tr>'."\n"; print'<tr><td>'. $langs->trans("CreatePoll") .'</td><td></td><td><input type="image" name="confirmation" value="'.$langs->trans('CreatePoll').'" src="images/add.png"></td></tr>'."\n";
print '</table>'."\n"; print '</table>'."\n";
} }

13
htdocs/opensurvey/public/create_survey.php
View File

@ -147,7 +147,8 @@ if (!$_SESSION["adresse"] && (GETPOST('creation_sondage_date') || GETPOST('creat
print "<td><font color=\"#FF0000\">" .$langs->trans("FieldMandatory") . " </font></td>"."\n"; print "<td><font color=\"#FF0000\">" .$langs->trans("FieldMandatory") . " </font></td>"."\n";
} elseif ($erreur_adresse && (GETPOST('creation_sondage_date') || GETPOST('creation_sondage_autre') || GETPOST('creation_sondage_date_x') || GETPOST('creation_sondage_autre_x'))) } elseif ($erreur_adresse && (GETPOST('creation_sondage_date') || GETPOST('creation_sondage_autre') || GETPOST('creation_sondage_date_x') || GETPOST('creation_sondage_autre_x')))
{ {
print "<td><font color=\"#FF0000\">" . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "</font></td>"."\n"; $langs->load('errors');
print "<td><font color=\"#FF0000\">" . $langs->trans("ErrorBadEMail", $adresse) . "</font></td>"."\n";
} }
print '</tr>'."\n"; print '</tr>'."\n";
@ -180,11 +181,11 @@ if (GETPOST('choix_sondage'))
else else
{ {
//affichage des boutons pour choisir sondage date ou autre //affichage des boutons pour choisir sondage date ou autre
print '<br><table >'."\n"; print '<br><table>'."\n";
print '<tr><td>'. _("Schedule an event") .'</td><td></td> '."\n"; print '<tr><td>'. $langs->trans("CreateSurveyDate") .'</td><td></td> '."\n";
print '<td><input type="image" name="creation_sondage_date" value="Trouver une date" src="images/calendar-32.png"></td></tr>'."\n"; print '<td><input type="image" name="creation_sondage_date" value="'.$langs->trans('CreateSurveyDate').'" src="images/calendar-32.png"></td></tr>'."\n";
print '<tr><td>'. _("Make a choice") .'</td><td></td> '."\n"; print '<tr><td>'. $langs->trans("CreateSurveyStandard") .'</td><td></td> '."\n";
print '<td><input type="image" name="creation_sondage_autre" value="'. _('Make a poll') . '" src="images/chart-32.png"></td></tr>'."\n"; print '<td><input type="image" name="creation_sondage_autre" value="'.$langs->trans('CreateSurveyStandard').'" src="images/chart-32.png"></td></tr>'."\n";
print '</table>'."\n"; print '</table>'."\n";
} }
print '<br><br><br>'."\n"; print '<br><br><br>'."\n";