Page MenuHomePhabricator
Files F15381591

D11155.diff
No OneTemporary
Actions

D11155.diff
View Options

diff --git a/src/applications/settings/panel/PhabricatorAccountSettingsPanel.php b/src/applications/settings/panel/PhabricatorAccountSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorAccountSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorAccountSettingsPanel.php
@@ -19,6 +19,9 @@
$username = $user->getUsername();
$pref_time = PhabricatorUserPreferences::PREFERENCE_TIME_FORMAT;
+ $pref_date = PhabricatorUserPreferences::PREFERENCE_DATE_FORMAT;
+ $pref_recent_date =
+ PhabricatorUserPreferences::PREFERENCE_RECENT_DATE_FORMAT;
$preferences = $user->loadPreferences();
$errors = array();
@@ -42,6 +45,9 @@
$user->setTranslation($request->getStr('translation'));
$preferences->setPreference($pref_time, $request->getStr($pref_time));
+ $preferences->setPreference($pref_date, $request->getStr($pref_date));
+ $preferences->setPreference($pref_recent_date,
+ $request->getStr($pref_recent_date));
if (!$errors) {
$preferences->save();
@@ -123,6 +129,20 @@
pht('Format used when rendering a time of day.'))
->setValue($preferences->getPreference($pref_time)))
->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Recent Date Format'))
+ ->setName($pref_recent_date)
+ ->setCaption(
+ pht('Format used when rendering a recent (within 30 days) date.'))
+ ->setValue($preferences->getPreference($pref_recent_date)))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Date Format'))
+ ->setName($pref_date)
+ ->setCaption(
+ pht('Format used when rendering a non-recent date.'))
+ ->setValue($preferences->getPreference($pref_date)))
+ ->appendChild(
id(new AphrontFormSubmitControl())
->setValue(pht('Save Account Settings')));
diff --git a/src/applications/settings/storage/PhabricatorUserPreferences.php b/src/applications/settings/storage/PhabricatorUserPreferences.php
--- a/src/applications/settings/storage/PhabricatorUserPreferences.php
+++ b/src/applications/settings/storage/PhabricatorUserPreferences.php
@@ -9,6 +9,8 @@
const PREFERENCE_TITLES = 'titles';
const PREFERENCE_MONOSPACED_TEXTAREAS = 'monospaced-textareas';
const PREFERENCE_TIME_FORMAT = 'time-format';
+ const PREFERENCE_DATE_FORMAT = 'date-format';
+ const PREFERENCE_RECENT_DATE_FORMAT = 'recent-date-format';
const PREFERENCE_RE_PREFIX = 're-prefix';
const PREFERENCE_NO_SELF_MAIL = 'self-mail';
diff --git a/src/view/viewutils.php b/src/view/viewutils.php
--- a/src/view/viewutils.php
+++ b/src/view/viewutils.php
@@ -4,7 +4,7 @@
return phabricator_format_local_time(
$epoch,
$user,
- _phutil_date_format($epoch));
+ _phutil_date_format($epoch, $user));
}
function phabricator_on_relative_date($epoch, $user) {
@@ -46,7 +46,7 @@
$epoch,
$user,
pht('%s, %s',
- _phutil_date_format($epoch),
+ _phabricator_date_format($epoch, $user),
_phabricator_time_format($user)));
}
@@ -63,6 +63,25 @@
return pht('g:i A');
}
+function _phabricator_date_format($epoch, $user) {
+ $now = time();
+ $shift = 30 * 24 * 60 * 60;
+ if ($epoch < $now + $shift && $epoch > $now - $shift) {
+ $pref = PhabricatorUserPreferences::PREFERENCE_RECENT_DATE_FORMAT;
+ $default = 'D, M j';
+ } else {
+ $pref = PhabricatorUserPreferences::PREFERENCE_DATE_FORMAT;
+ $default = 'M j Y';
+ }
+
+ $pref = $user->loadPreferences()->getPreference($pref);
+ if (strlen($pref)) {
+ return $pref;
+ } else {
+ return $default;
+ }
+}
+
/**
* This function does not usually need to be called directly. Instead, call
* @{function:phabricator_date}, @{function:phabricator_time}, or

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 8:31 AM (3 w, 18 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7687648
Default Alt Text
D11155.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility