Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: datepicker.js.php is needed for the translation !!

Browse Source
This commit is contained in:
Regis Houssin
2017-10-10 10:04:16 +02:00
parent 88e700ae12
commit 9ff0855812
3 changed files with 51 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4789,69 +4789,7 @@ class Form
{ {
$retstring.="<script type='text/javascript'>"; $retstring.="<script type='text/javascript'>";
$retstring.="$(function(){ $('#".$prefix."').datepicker({ $retstring.="$(function(){ $('#".$prefix."').datepicker({
dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
closeText: '".$langs->trans("Close")."',
prevText: '".$langs->trans("Previous")."',
nextText: '".$langs->trans("Next")."',
currentText: '".$langs->trans("Today")."',
monthNames: [
'".$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: [
'".$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: [
'".$langs->trans("Sunday")."',
'".$langs->trans("Monday")."',
'".$langs->trans("Tuesday")."',
'".$langs->trans("Wednesday")."',
'".$langs->trans("Thursday")."',
'".$langs->trans("Friday")."',
'".$langs->trans("Saturday")."'
],
dayNamesShort: [
'".$langs->trans("SundayMin")."',
'".$langs->trans("MondayMin")."',
'".$langs->trans("TuesdayMin")."',
'".$langs->trans("WednesdayMin")."',
'".$langs->trans("ThursdayMin")."',
'".$langs->trans("FridayMin")."',
'".$langs->trans("SaturdayMin")."'
],
dayNamesMin: [
'".$langs->trans("ShortSunday")."',
'".$langs->trans("ShortMonday")."',
'".$langs->trans("ShortTuesday")."',
'".$langs->trans("ShortWednesday")."',
'".$langs->trans("ShortThursday")."',
'".$langs->trans("ShortFriday")."',
'".$langs->trans("ShortSaturday")."'
],
autoclose: true, autoclose: true,
changeMonth: true,
changeYear: true,
todayHighlight: true,"; todayHighlight: true,";
if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
{ {

10
htdocs/core/js/datepicker.js.php
View File

@@ -106,7 +106,7 @@ $langs->trans("SaturdayMin")
?> ?>
// For eldy and jQuery date picker // For jQuery date picker
var tradMonths = <?php echo json_encode($tradMonths) ?>; var tradMonths = <?php echo json_encode($tradMonths) ?>;
var tradMonthsShort = <?php echo json_encode($tradMonthsShort) ?>; var tradMonthsShort = <?php echo json_encode($tradMonthsShort) ?>;
var tradDays = <?php echo json_encode($tradDays) ?>; var tradDays = <?php echo json_encode($tradDays) ?>;
@@ -119,9 +119,7 @@ $(document).ready(function() {
$.datepicker.setDefaults({ $.datepicker.setDefaults({
autoSize: true, autoSize: true,
changeMonth: true, changeMonth: true,
changeYear: true, changeYear: true
altField: '#timestamp',
altFormat: '@' // Gives a timestamp dateformat
}); });
}); });
@@ -139,9 +137,7 @@ jQuery(function($){
weekHeader: '<?php echo $langs->trans("Week"); ?>', weekHeader: '<?php echo $langs->trans("Week"); ?>',
dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>', dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>',
firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>, firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>,
isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>, isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>
showMonthAfterYear: false, // TODO add specific to country
yearSuffix: '' // TODO add specific to country
}; };
$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']); $.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
}); });

6
htdocs/main.inc.php
View File

@@ -1322,11 +1322,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<!-- Includes JS of Dolibarr -->'."\n"; print '<!-- Includes JS of Dolibarr -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
// Add datepicker default options // Add datepicker default options (needed by jquery datepicker!)
/*if (! defined('DISABLE_DATE_PICKER')) if (! defined('DISABLE_DATE_PICKER'))
{ {
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
}*/ }
// JS forced by modules (relative url starting with /) // JS forced by modules (relative url starting with /)
if (! empty($conf->modules_parts['js'])) // $conf->modules_parts['js'] is array('module'=>array('file1','file2')) if (! empty($conf->modules_parts['js'])) // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))