X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FUtil%2FTemporal.php;h=d121d59770657dc8e3b59a1efceef22567921a3b;hb=e0a763b07f12ecb7389925100959f9ac6ebe85a8;hp=46bd8bba50871deafc49449891feb330de8ebe70;hpb=c66c09d5fd86e74ac6f1b877143e8cf55e3a0340;p=friendica.git diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php index 46bd8bba50..d121d59770 100644 --- a/src/Util/Temporal.php +++ b/src/Util/Temporal.php @@ -11,9 +11,8 @@ use DateTimeZone; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; - -require_once 'boot.php'; -require_once 'include/text.php'; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; /** * @brief Temporal class @@ -113,8 +112,8 @@ class Temporal $options = str_replace('', '', $options); - $tpl = get_markup_template('field_select_raw.tpl'); - return replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('field_select_raw.tpl'); + return Renderer::replaceMacros($tpl, [ '$field' => [$name, $label, $current, $help, $options], ]); } @@ -139,8 +138,8 @@ class Temporal $age = (intval($value) ? self::getAgeByTimezone($value, $a->user["timezone"], $a->user["timezone"]) : ""); - $tpl = get_markup_template("field_input.tpl"); - $o = replace_macros($tpl, + $tpl = Renderer::getMarkupTemplate("field_input.tpl"); + $o = Renderer::replaceMacros($tpl, [ '$field' => [ 'dob', @@ -217,13 +216,13 @@ class Temporal // First day of the week (0 = Sunday) $firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week', 0); - $lang = substr(L10n::getBrowserLanguage(), 0, 2); + $lang = substr(L10n::getCurrentLang(), 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"])) { - $lang = Config::get('system', 'language', 'en'); + $lang = 'en'; } $o = ''; @@ -245,8 +244,8 @@ class Temporal $readable_format = str_replace(['Y', 'm', 'd', 'H', 'i'], ['yyyy', 'mm', 'dd', 'HH', 'MM'], $dateformat); - $tpl = get_markup_template('field_datetime.tpl'); - $o .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('field_datetime.tpl'); + $o .= Renderer::replaceMacros($tpl, [ '$field' => [ $id, $label, @@ -290,16 +289,22 @@ class Temporal $abs = strtotime($localtime); - if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === false) { + if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) { return L10n::t('never'); } + $isfuture = false; $etime = time() - $abs; - if ($etime < 1) { + if ($etime < 1 && $etime >= 0) { return L10n::t('less than a second ago'); } + if ($etime < 0){ + $etime = -$etime; + $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')], @@ -315,7 +320,12 @@ class Temporal $r = round($d); // translators - e.g. 22 hours ago, 1 minute ago if (!$format) { - $format = L10n::t('%1$d %2$s ago'); + if($isfuture){ + $format = L10n::t('in %1$d %2$s'); + } + else { + $format = L10n::t('%1$d %2$s ago'); + } } return sprintf($format, $r, (($r == 1) ? $str[0] : $str[1])); @@ -450,11 +460,11 @@ class Temporal $tddate = intval(DateTimeFormat::localNow('j')); } - $str_month = day_translate($mtab[$m]); + $str_month = L10n::getDay($mtab[$m]); $o = '
' . mb_substr(day_translate($dn[$a]), 0, 3, 'UTF-8') . ' | '; + $o .= '' . mb_substr(L10n::getDay($dn[$a]), 0, 3, 'UTF-8') . ' | '; } $o .= '
---|---|
"; $day = str_replace(' ', ' ', sprintf('%2.2d', $d)); if ($started) { - if (x($links, $d) !== false) { + if (isset($links[$d])) { $o .= "$day"; } else { $o .= $day; |