forked from Wavyzz/dolibarr
Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into develop
Conflicts: htdocs/core/js/datepicker.js.php
This commit is contained in:
Laurent Destailleur
@@ -76,47 +76,66 @@ $(document).ready(function() {
|
||||
|
||||
jQuery(function($){
|
||||
$.datepicker.regional['<?php echo $langs->defaultlang ?>'] = {
|
||||
closeText: '<?php echo dol_escape_js($langs->transnoentitiesnoconv("Close")) ?>',
|
||||
prevText: '<?php echo dol_escape_js($langs->transnoentitiesnoconv("Previous")) ?>',
|
||||
nextText: '<?php echo dol_escape_js($langs->transnoentitiesnoconv("Next")) ?>',
|
||||
currentText: '<?php echo dol_escape_js($langs->transnoentitiesnoconv("January")) ?>',
|
||||
monthNames: [<?php echo "'".$langs->transnoentitiesnoconv("January")."',".
|
||||
"'".$langs->transnoentitiesnoconv("February")."',".
|
||||
"'".$langs->transnoentitiesnoconv("March")."',".
|
||||
"'".$langs->transnoentitiesnoconv("April")."',".
|
||||
"'".$langs->transnoentitiesnoconv("May")."',".
|
||||
"'".$langs->transnoentitiesnoconv("June")."',".
|
||||
"'".$langs->transnoentitiesnoconv("July")."',".
|
||||
"'".$langs->transnoentitiesnoconv("August")."',".
|
||||
"'".$langs->transnoentitiesnoconv("September")."',".
|
||||
"'".$langs->transnoentitiesnoconv("October")."',".
|
||||
"'".$langs->transnoentitiesnoconv("November")."',".
|
||||
"'".$langs->transnoentitiesnoconv("December")."'" ?>],
|
||||
monthNamesShort: [<?php echo "'".$langs->transnoentitiesnoconv("JanuaryMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("FebruaryMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("MarchMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("AprilMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("MayMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("JuneMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("JulyMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("AugustMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("SeptemberMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("OctoberMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("NovemberMin")."',".
|
||||
"'".$langs->transnoentitiesnoconv("DecemberMin")."'" ?>],
|
||||
dayNames: ['<?php echo dol_escape_js($langs->transnoentitiesnoconv("Sunday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("Monday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("Tuesday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("Wednesday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("Thursday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("Friday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("Saturday")) ?>'],
|
||||
dayNamesShort: ['<?php echo dol_escape_js($langs->transnoentitiesnoconv("SundayMin")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("MondayMin")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("TuesdayMin")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("WednesdayMin")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ThursdayMin")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("FridayMin")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("SaturdayMin")) ?>'],
|
||||
dayNamesMin: ['<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortSunday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortMonday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortTuesday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortWednesday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortThursday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortFriday")) ?>','<?php echo dol_escape_js($langs->transnoentitiesnoconv("ShortSaturday")) ?>'],
|
||||
weekHeader: '<?php echo dol_escape_js($langs->transnoentitiesnoconv("Week")) ?>',
|
||||
dateFormat: '<?php echo $langs->transnoentitiesnoconv("FormatDateShortJQuery"); ?>',
|
||||
firstDay: <?php echo $conf->global->MAIN_START_WEEK; ?>,
|
||||
isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>,
|
||||
closeText: '<?php echo $langs->trans("Close") ?>',
|
||||
prevText: '<?php echo $langs->trans("Previous") ?>',
|
||||
nextText: '<?php echo $langs->trans("Next") ?>',
|
||||
currentText: '<?php echo $langs->trans("Now") ?>',
|
||||
monthNames: [<?php echo "'".$langs->trans("January")."',".
|
||||
"'".$langs->trans("February")."',".
|
||||
"'".$langs->trans("March")."',".
|
||||
"'".$langs->trans("April")."',".
|
||||
"'".$langs->trans("May")."',".
|
||||
"'".$langs->trans("June")."',".
|
||||
"'".$langs->trans("July")."',".
|
||||
"'".$langs->trans("August")."',".
|
||||
"'".$langs->trans("September")."',".
|
||||
"'".$langs->trans("October")."',".
|
||||
"'".$langs->trans("November")."',".
|
||||
"'".$langs->trans("December")."'" ?>],
|
||||
monthNamesShort: [<?php echo "'".$langs->trans("JanuaryMin")."',".
|
||||
"'".$langs->trans("FebruaryMin")."',".
|
||||
"'".$langs->trans("MarchMin")."',".
|
||||
"'".$langs->trans("AprilMin")."',".
|
||||
"'".$langs->trans("MayMin")."',".
|
||||
"'".$langs->trans("JuneMin")."',".
|
||||
"'".$langs->trans("JulyMin")."',".
|
||||
"'".$langs->trans("AugustMin")."',".
|
||||
"'".$langs->trans("SeptemberMin")."',".
|
||||
"'".$langs->trans("OctoberMin")."',".
|
||||
"'".$langs->trans("NovemberMin")."',".
|
||||
"'".$langs->trans("DecemberMin")."'" ?>],
|
||||
dayNames: [<?php echo "'".$langs->trans("Sunday")."',".
|
||||
"'".$langs->trans("Monday")."',".
|
||||
"'".$langs->trans("Tuesday")."',".
|
||||
"'".$langs->trans("Wednesday")."',".
|
||||
"'".$langs->trans("Thursday")."',".
|
||||
"'".$langs->trans("Friday")."',".
|
||||
"'".$langs->trans("Saturday")."'" ?>],
|
||||
dayNamesShort: [<?php echo "'".$langs->trans("SundayMin")."',".
|
||||
"'".$langs->trans("MondayMin")."',".
|
||||
"'".$langs->trans("TuesdayMin")."',".
|
||||
"'".$langs->trans("WednesdayMin")."',".
|
||||
"'".$langs->trans("ThursdayMin")."',".
|
||||
"'".$langs->trans("FridayMin")."',".
|
||||
"'".$langs->trans("SaturdayMin")."'" ?>],
|
||||
dayNamesMin: [<?php echo "'".$langs->trans("ShortSunday")."',".
|
||||
"'".$langs->trans("ShortMonday")."',".
|
||||
"'".$langs->trans("ShortTuesday")."',".
|
||||
"'".$langs->trans("ShortWednesday")."',".
|
||||
"'".$langs->trans("ShortThursday")."',".
|
||||
"'".$langs->trans("ShortFriday")."',".
|
||||
"'".$langs->trans("ShortSaturday")."'" ?>],
|
||||
weekHeader: '<?php echo $langs->trans("Week"); ?>',
|
||||
dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>',
|
||||
firstDay: <?php echo $conf->global->MAIN_START_WEEK; ?>,
|
||||
isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>,
|
||||
showMonthAfterYear: false,
|
||||
yearSuffix: ''};
|
||||
yearSuffix: '' // TODO add specific to country
|
||||
};
|
||||
$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
|
||||
});
|
||||
|
||||
|
||||
<?php
|
||||
if (is_object($db)) $db->close();
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user