Page MenuHomePhabricator
Files F15188931

D15965.diff
No OneTemporary
Actions

D15965.diff
View Options

diff --git a/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php b/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php
--- a/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php
+++ b/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php
@@ -81,16 +81,24 @@
$guess = 'ignore';
}
+ $current_zone = $viewer->getTimezoneIdentifier();
+ $current_zone = phutil_tag('strong', array(), $current_zone);
+
$form = id(new AphrontFormView())
->appendChild(
+ id(new AphrontFormMarkupControl())
+ ->setLabel(pht('Current Setting'))
+ ->setValue($current_zone))
+ ->appendChild(
id(new AphrontFormSelectControl())
->setName('timezone')
- ->setLabel(pht('Timezone'))
+ ->setLabel(pht('New Setting'))
->setOptions($options)
->setValue($guess));
return $this->newDialog()
->setTitle(pht('Adjust Timezone'))
+ ->setWidth(AphrontDialogView::WIDTH_FORM)
->appendParagraph(
pht(
'Your browser timezone (%s) differs from your profile timezone '.
@@ -100,7 +108,7 @@
$this->formatOffset($server_offset)))
->appendForm($form)
->addCancelButton(pht('Cancel'))
- ->addSubmitButton(pht('Submit'));
+ ->addSubmitButton(pht('Change Timezone'));
}
private function formatOffset($offset) {
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -241,7 +241,7 @@
'uri' => '/settings/timezone/',
'message' => pht(
'Your browser timezone setting differs from the timezone '.
- 'setting in your profile.'),
+ 'setting in your profile, click to reconcile.'),
'ignoreKey' => $ignore_key,
'ignore' => $ignore,
));

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 3:20 PM (3 h, 38 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7181375
Default Alt Text
D15965.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility