From 8a79e1afb34cf8098bc0e34180bb3b17b826c824 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 10:48:13 +0200 Subject: [PATCH] The datepicker is now localised --- include/datetime.php | 75 ++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 6461298ba2..79964ef404 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -43,18 +43,18 @@ function select_timezone($current = 'America/Los_Angeles') { if($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); - $o .= ''; + $o .= ''; } } $city = str_replace('_', ' ', t($city)); $selected = (($value == $current) ? " selected=\"selected\" " : ""); $o .= ""; - } + } $o .= ''; return $o; }} -// return a select using 'field_select_raw' template, with timezones +// return a select using 'field_select_raw' template, with timezones // groupped (primarily) by continent // arguments follow convetion as other field_* template array: // 'name', 'label', $value, 'help' @@ -63,12 +63,12 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang $options = select_timezone($current); $options = str_replace('','', $options); - + $tpl = get_markup_template('field_select_raw.tpl'); return replace_macros($tpl, array( '$field' => array($name, $label, $current, $help, $options), )); - + }} // General purpose date parse/convert function. @@ -92,8 +92,8 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // otherwise we end up with -0001-11-30 ... - // add 32 days so that we at least get year 00, and then hack around the fact that - // months and days always start with 1. + // add 32 days so that we at least get year 00, and then hack around the fact that + // months and days always start with 1. if(substr($s,0,10) == '0000-00-00') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); @@ -203,13 +203,25 @@ function timesel($format, $h, $m, $id='timepicker') { * set maximum date from picker with id $maxfrom (none by default) * @param boolean $required default false * @return string Parsed HTML output. - * + * * @todo Once browser support is better this could probably be replaced with * native HTML5 date picker. */ if(! function_exists('datetimesel')) { function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) { + $a = get_app(); + + // First day of the week (0 = Sunday) + $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); + if ($firstDay === false) $firstDay=0; + + $lang = substr(get_browser_language(), 0, 2); + + // Check if the detected language is supported by the picker + if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"))) + $lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en'); + $o = ''; $dateformat = ''; if($pickdate) $dateformat .= 'Y-m-d'; @@ -217,16 +229,17 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic if($picktime) $dateformat .= 'H:i'; $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; - + $input_text = $default ? 'value="' . date($dateformat, $default->getTimestamp()) . '"' : ''; $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; if(!$pickdate) $pickers .= ',datepicker: false'; if(!$picktime) $pickers .= ',timepicker: false'; $extra_js = ''; - if($minfrom != '') + $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; + if($minfrom != '') $extra_js .= "\$('#$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + if($maxfrom != '') $extra_js .= "\$('#$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -236,7 +249,9 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic $readable_format = str_replace('i','MM',$readable_format); $o .= "
"; $o .= '
'; - $o .= ""; + $o .= ""; return $o; }} @@ -248,27 +263,27 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic if(! function_exists('relative_date')) { function relative_date($posted_date,$format = null) { - $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); + $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); $abs = strtotime($localtime); - - if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) { + + if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) { return t('never'); } $etime = time() - $abs; - + if ($etime < 1) { return t('less than a second ago'); } - + /* $time_append = ''; if ($etime >= 86400) { $time_append = ' ('.$localtime.')'; } */ - + $a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')), 30 * 24 * 60 * 60 => array( t('month'), t('months')), 7 * 24 * 60 * 60 => array( t('week'), t('weeks')), @@ -277,7 +292,7 @@ function relative_date($posted_date,$format = null) { 60 => array( t('minute'), t('minutes')), 1 => array( t('second'), t('seconds')) ); - + foreach ($a as $secs => $str) { $d = $etime / $secs; if ($d >= 1) { @@ -295,13 +310,13 @@ function relative_date($posted_date,$format = null) { // Returns age in years, given a date of birth, // the timezone of the person whose date of birth is provided, // and the timezone of the person viewing the result. -// Why? Bear with me. Let's say I live in Mittagong, Australia, and my +// Why? Bear with me. Let's say I live in Mittagong, Australia, and my // birthday is on New Year's. You live in San Bruno, California. // When exactly are you going to see my age increase? -// A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start -// celebrating and become a year older. If you wish me happy birthday -// on January 1 (San Bruno time), you'll be a day late. - +// A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start +// celebrating and become a year older. If you wish me happy birthday +// on January 1 (San Bruno time), you'll be a day late. + function age($dob,$owner_tz = '',$viewer_tz = '') { if(! intval($dob)) return 0; @@ -357,7 +372,7 @@ function get_first_dim($y,$m) { // output a calendar for the given month, year. // if $links are provided (array), e.g. $links[12] => 'http://mylink' , -// date 12 will be linked appropriately. Today's date is also noted by +// date 12 will be linked appropriately. Today's date is also noted by // altering td class. // Months count from 1. @@ -376,7 +391,7 @@ function cal($y = 0,$m = 0, $links = false, $class='') { 'April','May','June', 'July','August','September', 'October','November','December' - ); + ); $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); @@ -427,8 +442,8 @@ function cal($y = 0,$m = 0, $links = false, $class='') { if($dow) for($a = $dow; $a < 7; $a ++) $o .= ' '; - $o .= ''."\r\n"; - + $o .= ''."\r\n"; + return $o; }} @@ -452,10 +467,10 @@ function update_contact_birthdays() { * * $bdtext is just a readable placeholder in case the event is shared * with others. We will replace it during presentation to our $importer - * to contain a sparkle link and perhaps a photo. + * to contain a sparkle link and perhaps a photo. * */ - + $bdtext = sprintf( t('%s\'s birthday'), $rr['name']); $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;