From 67077338a051ae3da8a9ad2d92c77eadca45e4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 5 Jan 2014 06:37:08 +0100
Subject: [PATCH] Improved translation of opensurvey module

---
 htdocs/langs/en_US/errors.lang           |  3 ++-
 htdocs/opensurvey/adminstuds_preview.php | 19 +++----------------
 htdocs/opensurvey/public/studs.php       |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 8eb265013c5..0fec31bebdd 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -37,6 +37,7 @@ ErrorBadParameters=Bad parameters
 ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s'
 ErrorBadImageFormat=Image file has not a supported format
 ErrorBadDateFormat=Value '%s' has wrong date format
+ErrorWrongDate=Date is not correct!
 ErrorFailedToWriteInDir=Failed to write in directory %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
 ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities.
@@ -63,7 +64,7 @@ ErrorNoValueForRadioType=Please fill value for radio list
 ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
 ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
 ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profil name already exists for this export set.
+ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled.
diff --git a/htdocs/opensurvey/adminstuds_preview.php b/htdocs/opensurvey/adminstuds_preview.php
index d103f75fddb..1bbf65ff457 100644
--- a/htdocs/opensurvey/adminstuds_preview.php
+++ b/htdocs/opensurvey/adminstuds_preview.php
@@ -503,7 +503,6 @@ if (GETPOST('ajoutsujet'))
 		
 		$formother=new FormOther($db);
 		//ajout d'une date avec creneau horaire
-		//print _("You can add a new scheduling date to your poll.<br> If you just want to add a new hour to an existant date, put the same date and choose a new hour.") .'<br><br> '."\n";
 		print $langs->trans("AddADate") .' :<br><br>'."\n";
 		print '<select name="nouveaujour"> '."\n";
 		print '<OPTION VALUE="vide"></OPTION>'."\n";
@@ -1008,27 +1007,15 @@ if ($nbofcheckbox >= 2)
 
 // S'il a oublié de remplir un nom
 if ((isset($_POST["boutonp"]) || isset($_POST["boutonp_x"])) && $_POST["nom"] == "") {
-	print '<tr>'."\n";
-	print "<td colspan=10><font color=#FF0000>" . _("Enter a name !") . "</font>\n";
-	print '</tr>'."\n";
+	setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Name")), 'errors');
 }
 
 if (isset($erreur_prenom) && $erreur_prenom) {
-	print '<tr>'."\n";
-	print "<td colspan=10><font color=#FF0000>" . _("The name you've chosen already exist in this poll!") . "</font></td>\n";
-	print '</tr>'."\n";
-}
-
-if (isset($erreur_injection) && $erreur_injection) {
-	print '<tr>'."\n";
-	print "<td colspan=10><font color=#FF0000>" . _("Characters \"  '  < et > are not permitted") . "</font></td>\n";
-	print '</tr>'."\n";
+	setEventMessage($langs->trans('VoteNameAlreadyExists'), 'errors');
 }
 
 if (isset($erreur_ajout_date) && $erreur_ajout_date) {
-	print '<tr>'."\n";
-	print "<td colspan=10><font color=#FF0000>" . _("The date is not correct !") . "</font></td>\n";
-	print '</tr>'."\n";
+	setEventMessage($langs->trans("ErrorWrongDate"), 'errors');
 }
 
 //fin du tableau
diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php
index 55763007643..df0ae20394a 100644
--- a/htdocs/opensurvey/public/studs.php
+++ b/htdocs/opensurvey/public/studs.php
@@ -643,7 +643,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 
 			if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
-				$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . _("for")  . ' ' . $toutsujetdate[1];
+				$meilleursujet .= dol_print_date($toutsujetdate[0],'daytext'). ' ('.dol_print_date($toutsujetdate[0],'%A').')' . ' - ' . $toutsujetdate[1];
 			} else {
 				$meilleursujet .= dol_print_date($toutsujet[$i],'daytext'). ' ('.dol_print_date($toutsujet[$i],'%A').')';
 			}