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

spelling and trad

Browse Source
This commit is contained in:
Philippe Grand 2011-05-30 09:16:33 +00:00
parent 342f80e11b
commit d11f726b6b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.form.class.php
View File

@ -2817,9 +2817,9 @@ class Form
/** /**
* Show a HTML widget to input a date or combo list for daye, month, years and optionnaly hours and minutes * Show a HTML widget to input a date or combo list for day, month, years and optionnaly hours and minutes
* Fields are preselected with : * Fields are preselected with :
* - set_time date (Local PHP server timestamps ou date au format YYYY-MM-DD ou YYYY-MM-DD HH:MM) * - set_time date (Local PHP server timestamps or date format YYYY-MM-DD or YYYY-MM-DD HH:MM)
* - local date of PHP server if set_time is '' * - local date of PHP server if set_time is ''
* - Empty (fields empty) if set_time is -1 (in this case, parameter empty must also have value 1) * - Empty (fields empty) if set_time is -1 (in this case, parameter empty must also have value 1)
* @param set_time Pre-selected date (must be a local PHP server timestamp) * @param set_time Pre-selected date (must be a local PHP server timestamp)
@ -2848,10 +2848,10 @@ class Form
if (! $set_time && $empty == 0) $set_time = dol_now('tzuser'); if (! $set_time && $empty == 0) $set_time = dol_now('tzuser');
// Analyse de la date de pre-selection // Analysis of the pre-selection date
if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/',$set_time,$reg)) if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/',$set_time,$reg))
{ {
// Date au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS' // Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
$syear = $reg[1]; $syear = $reg[1];
$smonth = $reg[2]; $smonth = $reg[2];
$sday = $reg[3]; $sday = $reg[3];
@ -2919,7 +2919,7 @@ class Form
// Show date with combo selects // Show date with combo selects
if (empty($conf->use_javascript_ajax) || $conf->global->MAIN_POPUP_CALENDAR == "none") if (empty($conf->use_javascript_ajax) || $conf->global->MAIN_POPUP_CALENDAR == "none")
{ {
// Jour // Day
$retstring.='<select'.($disabled?' disabled="true"':'').' class="flat" name="'.$prefix.'day">'; $retstring.='<select'.($disabled?' disabled="true"':'').' class="flat" name="'.$prefix.'day">';
if ($empty || $set_time == -1) if ($empty || $set_time == -1)