Merge branch 'add-broadcast-message-timezone-label' into 'master'

Add timezone information to the datetime select labels

Closes #23389

See merge request gitlab-org/gitlab-ce!18987

app/views/admin/broadcast_messages/_form.html.haml

@@ -27,11 +27,11 @@
     .col-sm-10
       = f.color_field :font, class: "form-control"
   .form-group
-    = f.label :starts_at, class: 'control-label'
+    = f.label :starts_at, _("Starts at (UTC)"), class: 'control-label'
     .col-sm-10.datetime-controls
       = f.datetime_select :starts_at, {}, class: 'form-control form-control-inline'
   .form-group
-    = f.label :ends_at, class: 'control-label'
+    = f.label :ends_at, _("Ends at (UTC)"), class: 'control-label'
     .col-sm-10.datetime-controls
       = f.datetime_select :ends_at, {}, class: 'form-control form-control-inline'
   .form-actions

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-15 15:05+0200\n"
-"PO-Revision-Date: 2018-05-15 15:05+0200\n"
+"POT-Creation-Date: 2018-05-16 18:52+0200\n"
+"PO-Revision-Date: 2018-05-16 18:52+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1872,6 +1872,9 @@ msgstr ""
 msgid "Enable the Performance Bar for a given group."
 msgstr ""
 
+msgid "Ends at (UTC)"
+msgstr ""
+
 msgid "Environments"
 msgstr ""
 
@@ -3780,6 +3783,9 @@ msgstr ""
 msgid "Started"
 msgstr ""
 
+msgid "Starts at (UTC)"
+msgstr ""
+
 msgid "Status"
 msgstr ""