Page MenuHomePhabricator
Files F13969048

D9907.id23782.diff
No OneTemporary
Actions

D9907.id23782.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2708,7 +2708,6 @@
),
'function' =>
array(
- '_phabricator_date_format' => 'view/viewutils.php',
'_phabricator_time_format' => 'view/viewutils.php',
'celerity_generate_unique_node_id' => 'infrastructure/celerity/api.php',
'celerity_get_resource_uri' => 'infrastructure/celerity/api.php',
@@ -2717,13 +2716,8 @@
'phabricator_date' => 'view/viewutils.php',
'phabricator_datetime' => 'view/viewutils.php',
'phabricator_form' => 'infrastructure/javelin/markup.php',
- 'phabricator_format_bytes' => 'view/viewutils.php',
'phabricator_format_local_time' => 'view/viewutils.php',
- 'phabricator_format_relative_time' => 'view/viewutils.php',
- 'phabricator_format_relative_time_detailed' => 'view/viewutils.php',
- 'phabricator_format_units_generic' => 'view/viewutils.php',
'phabricator_on_relative_date' => 'view/viewutils.php',
- 'phabricator_parse_bytes' => 'view/viewutils.php',
'phabricator_relative_date' => 'view/viewutils.php',
'phabricator_time' => 'view/viewutils.php',
'phid_get_subtype' => 'applications/phid/utils.php',
diff --git a/src/view/viewutils.php b/src/view/viewutils.php
--- a/src/view/viewutils.php
+++ b/src/view/viewutils.php
@@ -50,17 +50,6 @@
_phabricator_time_format($user)));
}
-function _phabricator_date_format($epoch) {
- $now = time();
- $shift = 30 * 24 * 60 * 60;
- if ($epoch < $now + $shift && $epoch > $now - $shift) {
- $format = pht('D, M j');
- } else {
- $format = pht('M j Y');
- }
- return $format;
-}
-
function _phabricator_time_format($user) {
$prefs = $user->loadPreferences();
@@ -119,161 +108,4 @@
return PhutilTranslator::getInstance()->translateDate($format, $date);
}
-function phabricator_format_relative_time($duration) {
- return phabricator_format_units_generic(
- $duration,
- array(60, 60, 24, 7),
- array('s', 'm', 'h', 'd', 'w'),
- $precision = 0);
-}
-
-/**
- * Format a relative time (duration) into weeks, days, hours, minutes,
- * seconds, but unlike phabricator_format_relative_time, does so for more than
- * just the largest unit.
- *
- * @param int Duration in seconds.
- * @param int Levels to render - will render the three highest levels, ie:
- * 5 h, 37 m, 1 s
- * @return string Human-readable description.
- */
-function phabricator_format_relative_time_detailed($duration, $levels = 2) {
- if ($duration == 0) {
- return 'now';
- }
- $levels = max(1, min($levels, 5));
- $remainder = 0;
-
- $is_negative = false;
- if ($duration < 0) {
- $is_negative = true;
- $duration = abs($duration);
- }
-
- $this_level = 1;
- $detailed_relative_time = phabricator_format_units_generic(
- $duration,
- array(60, 60, 24, 7),
- array('s', 'm', 'h', 'd', 'w'),
- $precision = 0,
- $remainder);
- $duration = $remainder;
-
- while ($remainder > 0 && $this_level < $levels) {
- $detailed_relative_time .= ', '.phabricator_format_units_generic(
- $duration,
- array(60, 60, 24, 7),
- array('s', 'm', 'h', 'd', 'w'),
- $precision = 0,
- $remainder);
- $duration = $remainder;
- $this_level++;
- };
-
- if ($is_negative) {
- $detailed_relative_time .= ' ago';
- }
-
- return $detailed_relative_time;
-}
-
-/**
- * Format a byte count for human consumption, e.g. "10MB" instead of
- * "10000000".
- *
- * @param int Number of bytes.
- * @return string Human-readable description.
- */
-function phabricator_format_bytes($bytes) {
- return phabricator_format_units_generic(
- $bytes,
- // NOTE: Using the SI version of these units rather than the 1024 version.
- array(1000, 1000, 1000, 1000, 1000),
- array('B', 'KB', 'MB', 'GB', 'TB', 'PB'),
- $precision = 0);
-}
-
-
-/**
- * Parse a human-readable byte description (like "6MB") into an integer.
- *
- * @param string Human-readable description.
- * @return int Number of represented bytes.
- */
-function phabricator_parse_bytes($input) {
- $bytes = trim($input);
- if (!strlen($bytes)) {
- return null;
- }
-
- // NOTE: Assumes US-centric numeral notation.
- $bytes = preg_replace('/[ ,]/', '', $bytes);
-
- $matches = null;
- if (!preg_match('/^(?:\d+(?:[.]\d+)?)([kmgtp]?)b?$/i', $bytes, $matches)) {
- throw new Exception("Unable to parse byte size '{$input}'!");
- }
-
- $scale = array(
- 'k' => 1000,
- 'm' => 1000 * 1000,
- 'g' => 1000 * 1000 * 1000,
- 't' => 1000 * 1000 * 1000 * 1000,
- 'p' => 1000 * 1000 * 1000 * 1000 * 1000,
- );
-
- $bytes = (float)$bytes;
- if ($matches[1]) {
- $bytes *= $scale[strtolower($matches[1])];
- }
-
- return (int)$bytes;
-}
-
-
-function phabricator_format_units_generic(
- $n,
- array $scales,
- array $labels,
- $precision = 0,
- &$remainder = null) {
- $is_negative = false;
- if ($n < 0) {
- $is_negative = true;
- $n = abs($n);
- }
-
- $remainder = 0;
- $accum = 1;
-
- $scale = array_shift($scales);
- $label = array_shift($labels);
- while ($n >= $scale && count($labels)) {
- $remainder += ($n % $scale) * $accum;
- $n /= $scale;
- $accum *= $scale;
- $label = array_shift($labels);
- if (!count($scales)) {
- break;
- }
- $scale = array_shift($scales);
- }
-
- if ($is_negative) {
- $n = -$n;
- $remainder = -$remainder;
- }
-
- if ($precision) {
- $num_string = number_format($n, $precision);
- } else {
- $num_string = (int)floor($n);
- }
-
- if ($label) {
- $num_string .= ' '.$label;
- }
-
- return $num_string;
-}

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 18, 12:13 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6724065
Default Alt Text
D9907.id23782.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility