diff options
| author | Phil Hughes <me@iamphill.com> | 2019-02-11 08:46:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-11 08:46:33 +0000 |
| commit | c71c50e45f921c3f6b7360bb5992dbabba83cf0e (patch) | |
| tree | 1da6fbda09c99becf30f9ec164d9a9b9db85c6d5 | |
| parent | 91b88e0be4a943aa7000c7d921e77fc200c53500 (diff) | |
| parent | 294a2a70edda5236146a0f3cbb069e42900fb9d3 (diff) | |
| download | gitlab-ce-c71c50e45f921c3f6b7360bb5992dbabba83cf0e.tar.gz | |
Merge branch 'i18n-externalize-date-picker-string' into 'master'
Externalize date picker string
See merge request gitlab-org/gitlab-ce!25068
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/pikaday.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue | 3 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/pikaday.vue b/app/assets/javascripts/vue_shared/components/pikaday.vue index 13eb46437dd..fa502b9beb9 100644 --- a/app/assets/javascripts/vue_shared/components/pikaday.vue +++ b/app/assets/javascripts/vue_shared/components/pikaday.vue @@ -1,6 +1,7 @@ <script> import Pikaday from 'pikaday'; import { parsePikadayDate, pikadayToString } from '~/lib/utils/datetime_utility'; +import { __ } from '~/locale'; export default { name: 'DatePicker', @@ -8,7 +9,7 @@ export default { label: { type: String, required: false, - default: 'Date picker', + default: __('Date picker'), }, selectedDate: { type: Date, diff --git a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue index 6c0c7f15943..45f01a6fced 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/date_picker.vue @@ -4,6 +4,7 @@ import datePicker from '../pikaday.vue'; import toggleSidebar from './toggle_sidebar.vue'; import collapsedCalendarIcon from './collapsed_calendar_icon.vue'; import { dateInWords } from '../../../lib/utils/datetime_utility'; +import { __ } from '~/locale'; export default { name: 'SidebarDatePicker', @@ -42,7 +43,7 @@ export default { label: { type: String, required: false, - default: 'Date picker', + default: __('Date picker'), }, selectedDate: { type: Date, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index c3349980d60..8d7ed7a5b88 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2501,6 +2501,9 @@ msgstr "" msgid "Data is still calculating..." msgstr "" +msgid "Date picker" +msgstr "" + msgid "Debug" msgstr "" |