X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdatetime.php;h=a8320d33216a448fd70647f3eda112384052dcc6;hb=d49f986d1eb6894dd948577288357b6c1755e3d3;hp=0faea8c90e5fd9e4b8caa31242021f5fb88e584e;hpb=39ff6e9ce9251fe69b56ba05ea7bdc1896f34de2;p=friendica.git

diff --git a/include/datetime.php b/include/datetime.php
index 0faea8c90e..a8320d3321 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
 
@@ -17,21 +18,21 @@ use Friendica\Database\DBM;
  */
 function timezone_cmp($a, $b) {
 	if (strstr($a, '/') && strstr($b, '/')) {
-		if ( t($a) == t($b)) {
+		if (L10n::t($a) == L10n::t($b)) {
 			return 0;
 		}
-		return ( t($a) < t($b)) ? -1 : 1;
+		return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
 	}
 
 	if (strstr($a, '/')) {
 		return -1;
 	} elseif (strstr($b, '/')) {
 		return  1;
-	} elseif ( t($a) == t($b)) {
+	} elseif (L10n::t($a) == L10n::t($b)) {
 		return 0;
 	}
 
-	return ( t($a) < t($b)) ? -1 : 1;
+	return (L10n::t($a) < L10n::t($b)) ? -1 : 1;
 }
 
 /**
@@ -56,7 +57,7 @@ function select_timezone($current = 'America/Los_Angeles') {
 					$o .= '</optgroup>';
 				}
 				$continent = $ex[0];
-				$o .= '<optgroup label="' . t($continent) . '">';
+				$o .= '<optgroup label="' . L10n::t($continent) . '">';
 			}
 			if (count($ex) > 2) {
 				$city = substr($value,strpos($value,'/')+1);
@@ -65,13 +66,13 @@ function select_timezone($current = 'America/Los_Angeles') {
 			}
 		} else {
 			$city = $ex[0];
-			if ($continent != t('Miscellaneous')) {
+			if ($continent != L10n::t('Miscellaneous')) {
 				$o .= '</optgroup>';
-				$continent = t('Miscellaneous');
-				$o .= '<optgroup label="' . t($continent) . '">';
+				$continent = L10n::t('Miscellaneous');
+				$o .= '<optgroup label="' . L10n::t($continent) . '">';
 			}
 		}
-		$city = str_replace('_', ' ',  t($city));
+		$city = str_replace('_', ' ', L10n::t($city));
 		$selected = (($value == $current) ? " selected=\"selected\" " : "");
 		$o .= "<option value=\"$value\" $selected >$city</option>";
 	}
@@ -194,17 +195,17 @@ function dob($dob)
 			'dob',
 			t('Birthday:'),
 			$value,
-			(((intval($age)) > 0 ) ? t('Age: ') . $age : ""),
+			(((intval($age)) > 0 ) ? L10n::t('Age: ') . $age : ""),
 			'',
-			'placeholder="' . t('YYYY-MM-DD or MM-DD') . '"'
+			'placeholder="' . L10n::t('YYYY-MM-DD or MM-DD') . '"'
 		]
 	]);
 
 	/// @TODO Old-lost code?
-//	if ($dob && $dob > '0001-01-01')
-//		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year), 'dob');
-//	else
-//		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob');
+	//	if ($dob && $dob > '0001-01-01')
+	//		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year), 'dob');
+	//	else
+	//		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),false,'dob');
 
 	return $o;
 }
@@ -276,7 +277,7 @@ function datetimesel($min, $max, $default, $label, $id = 'datetimepicker', $pick
 	// First day of the week (0 = Sunday)
 	$firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0);
 
-	$lang = substr(get_browser_language(), 0, 2);
+	$lang = substr(L10n::getBrowserLanguage(), 0, 2);
 
 	// Check if the detected language is supported by the picker
 	if (!in_array($lang, ["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"])) {
@@ -358,23 +359,23 @@ function relative_date($posted_date, $format = null) {
 
 	$abs = strtotime($localtime);
 
-	if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === False) {
-		 return t('never');
+	if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === false) {
+		 return L10n::t('never');
 	}
 
 	$etime = time() - $abs;
 
 	if ($etime < 1) {
-		return t('less than a second ago');
+		return L10n::t('less than a second ago');
 	}
 
-	$a = [ 12 * 30 * 24 * 60 * 60  =>  [ t('year'),   t('years')],
-				30 * 24 * 60 * 60       =>  [ t('month'),  t('months')],
-				7  * 24 * 60 * 60       =>  [ t('week'),   t('weeks')],
-				24 * 60 * 60            =>  [ t('day'),    t('days')],
-				60 * 60                 =>  [ t('hour'),   t('hours')],
-				60                      =>  [ t('minute'), t('minutes')],
-				1                       =>  [ t('second'), t('seconds')]
+	$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')]
 	];
 
 	foreach ($a as $secs => $str) {
@@ -383,7 +384,7 @@ function relative_date($posted_date, $format = null) {
 			$r = round($d);
 			// translators - e.g. 22 hours ago, 1 minute ago
 			if (!$format) {
-				$format = t('%1$d %2$s ago');
+				$format = L10n::t('%1$d %2$s ago');
 			}
 
 			return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1]));
@@ -610,8 +611,8 @@ function update_contact_birthdays() {
 				continue;
 			}
 
-			$bdtext = sprintf( t('%s\'s birthday'), $rr['name']);
-			$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
+			$bdtext = sprintf(L10n::t('%s\'s birthday'), $rr['name']);
+			$bdtext2 = sprintf(L10n::t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ;
 
 			q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
 				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ",