Merge branch 'eread/refactor-timezone-topics' into 'master'

Refactor timezone UI and documentation

See merge request gitlab-org/gitlab!67301

app/views/profiles/show.html.haml

@@ -77,12 +77,10 @@
   .row.user-time-preferences.js-search-settings-section
     .col-lg-4.profile-settings-sidebar
       %h4.gl-mt-0= s_("Profiles|Time settings")
-      %p= s_("Profiles|You can set your current timezone here")
+      %p= s_("Profiles|Set your local time zone")
     .col-lg-8
-      -# TODO: might need an entry in user/profile.md to describe some of these settings
-      -# https://gitlab.com/gitlab-org/gitlab-foss/issues/60070
       %h5= _("Time zone")
-      = dropdown_tag(_("Select a timezone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a timezone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
+      = dropdown_tag(_("Select a time zone"), options: { toggle_class: 'gl-button btn js-timezone-dropdown input-lg', title: _("Select a time zone"), filter: true, placeholder: s_("OfSearchInADropdown|Filter"), data: { data: timezone_data } } )
       %input.hidden{ :type => 'hidden', :id => 'user_timezone', :name => 'user[timezone]', value: @user.timezone }
     .col-lg-12
       %hr

doc/.vale/gitlab/SubstitutionWarning.yml

@@ -18,6 +18,7 @@ swap:
   filesystem: file system
   info: information
   repo: repository
+  timezone: time zone
   utilize: use
   administrator access: the Administrator role
   administrator permission: the Administrator role

doc/administration/timezone.md

@@ -48,13 +48,8 @@ gitlab-ctl restart
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 13.9.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/29669) in GitLab 14.1.
 
-This setting controls the local time displayed on a user's profile.
-See [&280](https://gitlab.com/groups/gitlab-org/-/epics/280) for other planned features.
+A user can set their time zone in their profile. If a user has not set their time zone, it defaults
+to the time zone [configured at the instance level](#changing-your-time-zone). On GitLab.com, the
+default time zone is UTC.
 
-NOTE:
-If a user has not set their time zone, it defaults to the time zone [configured at the instance level](#changing-your-time-zone). On GitLab.com, the default time zone is UTC.
-
-1. Navigate to [your user settings](../user/profile/index.md#access-your-user-settings).
-1. Select your time zone from the dropdown.
-
-![User Time Zone Settings](img/time_zone_settings.png)
+For more information, see [Set your time zone](../user/profile/index.md#set-your-time-zone).

doc/user/profile/index.md

@@ -192,6 +192,14 @@ To set the busy status indicator, either:
   | --- | --- |
   | ![Busy status - notes](img/busy_indicator_notes_v13_9.png) | ![Busy status - note header](img/busy_indicator_note_header_v13_9.png) |
 
+## Set your time zone
+
+To set your time zone:
+
+1. In the top-right corner, select your avatar.
+1. Select **Edit profile**.
+1. In the **Time settings** section, select your time zone from the dropdown list.
+
 ## Change the email displayed on your commits
 
 A commit email is an email address displayed in every Git-related action carried out through the GitLab interface.

locale/gitlab.pot

@@ -25410,6 +25410,9 @@ msgstr ""
 msgid "Profiles|Set new profile picture"
 msgstr ""
 
+msgid "Profiles|Set your local time zone"
+msgstr ""
+
 msgid "Profiles|Social sign-in"
 msgstr ""
 
@@ -25491,9 +25494,6 @@ msgstr ""
 msgid "Profiles|You can change your avatar here or remove the current avatar to revert to %{gravatar_link}"
 msgstr ""
 
-msgid "Profiles|You can set your current timezone here"
-msgstr ""
-
 msgid "Profiles|You can upload your avatar here"
 msgstr ""
 
@@ -29742,6 +29742,9 @@ msgstr ""
 msgid "Select a template type"
 msgstr ""
 
+msgid "Select a time zone"
+msgstr ""
+
 msgid "Select a timezone"
 msgstr ""