diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 12:33:42 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-05-21 12:33:42 +0000 |
| commit | 7100f89f32b9cc95b03ea4e557f969da2b47e121 (patch) | |
| tree | cf9eea8465a7a8efce5b10247bf470c115b70215 | |
| parent | 98b0ca62c2c24acf0a0bb58a6857f383b3fc90ff (diff) | |
| parent | 28c6f4f9f488ea6f2b1cb16104fa3d7c31caa81d (diff) | |
| download | gitlab-ce-7100f89f32b9cc95b03ea4e557f969da2b47e121.tar.gz | |
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
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 5a4ed1c3a2a..813ad451b44 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 90cdfd0dd03..14228b18332 100644 --- a/locale/gitlab.pot +++ b/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 "" |