X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FTemporal.php;h=e6d0f207df71963d48ae28f140232e3ddcb9642b;hb=17d49422b4f7b3d1ed06859f996876a85028d87b;hp=75211a0927e8796572041a21bd0af7cbc277cbb2;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php index 75211a0927..e6d0f207df 100644 --- a/src/Util/Temporal.php +++ b/src/Util/Temporal.php @@ -1,16 +1,31 @@ . + * */ namespace Friendica\Util; use DateTime; use DateTimeZone; -use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; /** * Temporal class @@ -131,12 +146,15 @@ class Temporal if ($dob < '0000-01-01') { $value = ''; + $age = 0; + } elseif ($dob < '0001-00-00') { + $value = substr($dob, 5); + $age = 0; } else { - $value = DateTimeFormat::utc(($year > 1000) ? $dob : '1000-' . $month . '-' . $day, 'Y-m-d'); + $value = DateTimeFormat::utc($dob, 'Y-m-d'); + $age = self::getAgeByTimezone($value, $timezone); } - $age = (intval($value) ? self::getAgeByTimezone($value, $timezone, $timezone) : ""); - $tpl = Renderer::getMarkupTemplate("field_input.tpl"); $o = Renderer::replaceMacros($tpl, [ @@ -144,7 +162,7 @@ class Temporal 'dob', DI::l10n()->t('Birthday:'), $value, - intval($age) > 0 ? DI::l10n()->t('Age: ') . $age : "", + intval($age) > 0 ? DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', $age) : '', '', 'placeholder="' . DI::l10n()->t('YYYY-MM-DD or MM-DD') . '"' ] @@ -207,7 +225,7 @@ class Temporal public static function getDateTimeField( DateTime $minDate, DateTime $maxDate, - DateTime $defaultDate, + DateTime $defaultDate = null, $label, $id = 'datetimepicker', $pickdate = true, @@ -219,7 +237,7 @@ class Temporal // First day of the week (0 = Sunday) $firstDay = DI::pConfig()->get(local_user(), 'system', 'first_day_of_week', 0); - $lang = substr(L10n::getCurrentLang(), 0, 2); + $lang = substr(DI::l10n()->getCurrentLang(), 0, 2); // Check if the detected language is supported by the picker if (!in_array($lang, @@ -253,7 +271,11 @@ class Temporal $id, $label, $input_text, - '', + DI::l10n()->t( + 'Time zone: %s Change in Settings', + str_replace('_', ' ', DI::app()->getTimeZone()) . ' (GMT ' . DateTimeFormat::localNow('P') . ')', + DI::baseUrl() . '/settings' + ), $required ? '*' : '', 'placeholder="' . $readable_format . '"' ], @@ -266,7 +288,7 @@ class Temporal 'lang' => $lang, 'minfrom' => $minfrom, 'maxfrom' => $maxfrom, - ] + ], ]); return $o; @@ -339,48 +361,27 @@ class Temporal /** * Returns timezone correct age in years. * - * Returns the 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. + * Returns the age in years, given a date of birth and the timezone of the person + * whose date of birth is provided. * - * 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. - * - * @param string $dob Date of Birth - * @param string $owner_tz (optional) Timezone of the person of interest - * @param string $viewer_tz (optional) Timezone of the person viewing + * @param string $dob Date of Birth + * @param string $timezone Timezone of the person of interest * * @return int Age in years * @throws \Exception */ - public static function getAgeByTimezone($dob, $owner_tz = '', $viewer_tz = '') + public static function getAgeByTimezone(string $dob, string $timezone): int { if (!intval($dob)) { return 0; } - if (!$owner_tz) { - $owner_tz = date_default_timezone_get(); - } - if (!$viewer_tz) { - $viewer_tz = date_default_timezone_get(); - } - $birthdate = DateTimeFormat::convert($dob . ' 00:00:00+00:00', $owner_tz, 'UTC', 'Y-m-d'); - list($year, $month, $day) = explode("-", $birthdate); - $year_diff = DateTimeFormat::timezoneNow($viewer_tz, 'Y') - $year; - $curr_month = DateTimeFormat::timezoneNow($viewer_tz, 'm'); - $curr_day = DateTimeFormat::timezoneNow($viewer_tz, 'd'); + $birthdate = new DateTime($dob . ' 00:00:00', new DateTimeZone($timezone)); + $currentDate = new DateTime('now', new DateTimeZone('UTC')); - if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) { - $year_diff--; - } + $interval = $birthdate->diff($currentDate); - return $year_diff; + return (int) $interval->format('%y'); } /** @@ -466,11 +467,11 @@ class Temporal $tddate = intval(DateTimeFormat::localNow('j')); } - $str_month = L10n::getDay($mtab[$m]); + $str_month = DI::l10n()->getDay($mtab[$m]); $o = '
' . mb_substr(L10n::getDay($dn[$a]), 0, 3, 'UTF-8') . ' | '; + $o .= '' . mb_substr(DI::l10n()->getDay($dn[$a]), 0, 3, 'UTF-8') . ' | '; } $o .= '
---|---|