Wordsmith the timezone selection UX

Summary:
Ref T3025.

  - Show current zone to make the current vs new more clear.
  - Tweak some text.

Test Plan: {F1656534}

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T3025

Differential Revision: https://secure.phabricator.com/D15965

src/applications/settings/controller/PhabricatorSettingsTimezoneController.php

@@ -81,16 +81,24 @@ final class PhabricatorSettingsTimezoneController
       $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 @@ final class PhabricatorSettingsTimezoneController
           $this->formatOffset($server_offset)))
       ->appendForm($form)
       ->addCancelButton(pht('Cancel'))
-      ->addSubmitButton(pht('Submit'));
+      ->addSubmitButton(pht('Change Timezone'));
   }
 
   private function formatOffset($offset) {

src/view/page/PhabricatorStandardPageView.php

@@ -241,7 +241,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView
             '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,
           ));