diff --git a/e107_handlers/date_handler.php b/e107_handlers/date_handler.php index fc50dcd0d..521d22541 100644 --- a/e107_handlers/date_handler.php +++ b/e107_handlers/date_handler.php @@ -657,18 +657,20 @@ class e_date return $mode ? array($justNow) : $justNow; } - if($older_date < $newer_date) // past { - return ($mode ? $ret : implode(", ", $ret) . " " . LANDT_AGO); + + $replace = implode(", ", $ret); + $xago = e107::getParser()->lanVars(LANDT_XAGO, $replace); + return ($mode ? $ret : $xago); } else // future { - return ($mode ? $ret : LANDT_IN ." ". implode(", ", $ret)); + $replace = implode(", ", $ret); + $inx = e107::getParser()->lanVars(LANDT_INX, $replace); + return ($mode ? $ret : $inx); } - - // print_r($ret); diff --git a/e107_languages/English/lan_date.php b/e107_languages/English/lan_date.php index 4cd15baee..e422c8ab7 100644 --- a/e107_languages/English/lan_date.php +++ b/e107_languages/English/lan_date.php @@ -21,5 +21,7 @@ define("LANDT_09", "sec"); define("LANDT_09s", "secs"); define("LANDT_AGO", "ago"); define("LANDT_IN", "in"); +define("LANDT_XAGO", "[x] ago"); +define("LANDT_INX", "in [x]"); define("LANDT_10", "Just now"); \ No newline at end of file diff --git a/install.php b/install.php index c3230d12b..2d582b5a9 100644 --- a/install.php +++ b/install.php @@ -1378,11 +1378,13 @@ class e_install // -- Optional -- +// define('e_DEBUG', true); // Enable debug mode to allow displaying of errors // define('e_HTTP_STATIC', 'https://static.mydomain.com/'); // Use a static subdomain for js/css/images etc. // define('e_MOD_REWRITE_STATIC', true); // Rewrite static image urls. // define('e_LOG_CRITICAL', true); // log critical errors but do not display them to user. // define('e_GIT', 'path-to-git'); // Path to GIT for developers - +// define('X-FRAME-SAMEORIGIN', false); // Option to override X-Frame-Options +// define('e_PDO, true); // Enable PDO mode (used in PHP > 7 and when mysql_* methods are not available) "; /*