From 8092d90c79fc79e8e17b0f50a449e7d2e204acde Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Thu, 9 Nov 2023 23:05:28 +0000 Subject: [PATCH] Adjust message in timezone conflict form Summary: This applies a suggestion initially proposed in https://we.phorge.it/D25420#12264 Test Plan: - Change your browser/system timezone to differ from your Phorge profile timezone - Click the notice that Phorge shows at the bottom left about the timezone mismatch - Confirm that the form text has been changed as per the diff in this revision Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: aklapper, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D25458 --- .../controller/PhabricatorSettingsTimezoneController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php b/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php index 9cde82fdf0..0ed286da02 100644 --- a/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php +++ b/src/applications/settings/controller/PhabricatorSettingsTimezoneController.php @@ -114,8 +114,8 @@ final class PhabricatorSettingsTimezoneController ->appendParagraph( pht( 'Your browser timezone (%s) differs from your profile timezone '. - '(%s). You can ignore this conflict or adjust your profile setting '. - 'to match your client.', + '(%s). You can adjust your profile setting to match your browser, '. + 'or ignore this conflict to keep your current profile setting.', $this->formatOffset($client_offset), $this->formatOffset($server_offset))) ->appendForm($form)