X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FTemporal.php;h=e6d0f207df71963d48ae28f140232e3ddcb9642b;hb=c33611c484e2cf5a3c626566588e26a1d14e12c6;hp=729dc6e343a3eea7cf66243ed2e95fdab1b30dfd;hpb=af88c2daa34e39cb6430abf64d0648665bfeb9cd;p=friendica.git

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 729dc6e343..e6d0f207df 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -1,16 +1,31 @@
 <?php
-
 /**
- * @file src/Util/Temporal.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Util;
 
 use DateTime;
 use DateTimeZone;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 /**
  * Temporal class
@@ -27,21 +42,21 @@ class Temporal
 	private static function timezoneCompareCallback($a, $b)
 	{
 		if (strstr($a, '/') && strstr($b, '/')) {
-			if (L10n::t($a) == L10n::t($b)) {
+			if (DI::l10n()->t($a) == DI::l10n()->t($b)) {
 				return 0;
 			}
-			return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
+			return (DI::l10n()->t($a) < DI::l10n()->t($b)) ? -1 : 1;
 		}
 
 		if (strstr($a, '/')) {
 			return -1;
 		} elseif (strstr($b, '/')) {
 			return 1;
-		} elseif (L10n::t($a) == L10n::t($b)) {
+		} elseif (DI::l10n()->t($a) == DI::l10n()->t($b)) {
 			return 0;
 		}
 
-		return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
+		return (DI::l10n()->t($a) < DI::l10n()->t($b)) ? -1 : 1;
 	}
 
 	/**
@@ -66,7 +81,7 @@ class Temporal
 						$o .= '</optgroup>';
 					}
 					$continent = $ex[0];
-					$o .= '<optgroup label="' . L10n::t($continent) . '">';
+					$o .= '<optgroup label="' . DI::l10n()->t($continent) . '">';
 				}
 				if (count($ex) > 2) {
 					$city = substr($value, strpos($value, '/') + 1);
@@ -75,13 +90,13 @@ class Temporal
 				}
 			} else {
 				$city = $ex[0];
-				if ($continent != L10n::t('Miscellaneous')) {
+				if ($continent != DI::l10n()->t('Miscellaneous')) {
 					$o .= '</optgroup>';
-					$continent = L10n::t('Miscellaneous');
-					$o .= '<optgroup label="' . L10n::t($continent) . '">';
+					$continent = DI::l10n()->t('Miscellaneous');
+					$o .= '<optgroup label="' . DI::l10n()->t($continent) . '">';
 				}
 			}
-			$city = str_replace('_', ' ', L10n::t($city));
+			$city = str_replace('_', ' ', DI::l10n()->t($city));
 			$selected = (($value == $current) ? " selected=\"selected\" " : "");
 			$o .= "<option value=\"$value\" $selected >$city</option>";
 		}
@@ -131,22 +146,25 @@ 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,
 			[
 			'$field' => [
 				'dob',
-				L10n::t('Birthday:'),
+				DI::l10n()->t('Birthday:'),
 				$value,
-				intval($age) > 0 ? L10n::t('Age: ') . $age : "",
+				intval($age) > 0 ? DI::l10n()->t('Age: ') . DI::l10n()->tt('%d year old', '%d years old', $age) : '',
 				'',
-				'placeholder="' . L10n::t('YYYY-MM-DD or MM-DD') . '"'
+				'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: <strong>%s</strong> <a href="%s">Change in Settings</a>',
+					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;
@@ -293,14 +315,14 @@ class Temporal
 		$abs = strtotime($localtime);
 
 		if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) {
-			return L10n::t('never');
+			return DI::l10n()->t('never');
 		}
 
 		$isfuture = false;
 		$etime = time() - $abs;
 
 		if ($etime < 1 && $etime >= 0) {
-			return L10n::t('less than a second ago');
+			return DI::l10n()->t('less than a second ago');
 		}
 
 		if ($etime < 0){
@@ -308,13 +330,13 @@ class Temporal
 			$isfuture = true;
 		}
 
-		$a = [12 * 30 * 24 * 60 * 60 => [L10n::t('year'), L10n::t('years')],
-			30 * 24 * 60 * 60 => [L10n::t('month'), L10n::t('months')],
-			7 * 24 * 60 * 60 => [L10n::t('week'), L10n::t('weeks')],
-			24 * 60 * 60 => [L10n::t('day'), L10n::t('days')],
-			60 * 60 => [L10n::t('hour'), L10n::t('hours')],
-			60 => [L10n::t('minute'), L10n::t('minutes')],
-			1 => [L10n::t('second'), L10n::t('seconds')]
+		$a = [12 * 30 * 24 * 60 * 60 => [DI::l10n()->t('year'), DI::l10n()->t('years')],
+			30 * 24 * 60 * 60 => [DI::l10n()->t('month'), DI::l10n()->t('months')],
+			7 * 24 * 60 * 60 => [DI::l10n()->t('week'), DI::l10n()->t('weeks')],
+			24 * 60 * 60 => [DI::l10n()->t('day'), DI::l10n()->t('days')],
+			60 * 60 => [DI::l10n()->t('hour'), DI::l10n()->t('hours')],
+			60 => [DI::l10n()->t('minute'), DI::l10n()->t('minutes')],
+			1 => [DI::l10n()->t('second'), DI::l10n()->t('seconds')]
 		];
 
 		foreach ($a as $secs => $str) {
@@ -324,10 +346,10 @@ class Temporal
 				// translators - e.g. 22 hours ago, 1 minute ago
 				if (!$format) {
 					if($isfuture){
-						$format = L10n::t('in %1$d %2$s');
+						$format = DI::l10n()->t('in %1$d %2$s');
 					}
 					else {
-						$format = L10n::t('%1$d %2$s ago');
+						$format = DI::l10n()->t('%1$d %2$s ago');
 					}
 				}
 
@@ -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 = '<table class="calendar' . $class . '">';
 		$o .= "<caption>$str_month $y</caption><tr>";
 		for ($a = 0; $a < 7; $a ++) {
-			$o .= '<th>' . mb_substr(L10n::getDay($dn[$a]), 0, 3, 'UTF-8') . '</th>';
+			$o .= '<th>' . mb_substr(DI::l10n()->getDay($dn[$a]), 0, 3, 'UTF-8') . '</th>';
 		}
 
 		$o .= '</tr><tr>';