Commit c71c50e4 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'i18n-externalize-date-picker-string' into 'master'

Externalize date picker string

See merge request gitlab-org/gitlab-ce!25068
parents 91b88e0b 294a2a70
<script> <script>
import Pikaday from 'pikaday'; import Pikaday from 'pikaday';
import { parsePikadayDate, pikadayToString } from '~/lib/utils/datetime_utility'; import { parsePikadayDate, pikadayToString } from '~/lib/utils/datetime_utility';
import { __ } from '~/locale';
export default { export default {
name: 'DatePicker', name: 'DatePicker',
...@@ -8,7 +9,7 @@ export default { ...@@ -8,7 +9,7 @@ export default {
label: { label: {
type: String, type: String,
required: false, required: false,
default: 'Date picker', default: __('Date picker'),
}, },
selectedDate: { selectedDate: {
type: Date, type: Date,
......
...@@ -4,6 +4,7 @@ import datePicker from '../pikaday.vue'; ...@@ -4,6 +4,7 @@ import datePicker from '../pikaday.vue';
import toggleSidebar from './toggle_sidebar.vue'; import toggleSidebar from './toggle_sidebar.vue';
import collapsedCalendarIcon from './collapsed_calendar_icon.vue'; import collapsedCalendarIcon from './collapsed_calendar_icon.vue';
import { dateInWords } from '../../../lib/utils/datetime_utility'; import { dateInWords } from '../../../lib/utils/datetime_utility';
import { __ } from '~/locale';
export default { export default {
name: 'SidebarDatePicker', name: 'SidebarDatePicker',
...@@ -42,7 +43,7 @@ export default { ...@@ -42,7 +43,7 @@ export default {
label: { label: {
type: String, type: String,
required: false, required: false,
default: 'Date picker', default: __('Date picker'),
}, },
selectedDate: { selectedDate: {
type: Date, type: Date,
......
...@@ -2501,6 +2501,9 @@ msgstr "" ...@@ -2501,6 +2501,9 @@ msgstr ""
msgid "Data is still calculating..." msgid "Data is still calculating..."
msgstr "" msgstr ""
msgid "Date picker"
msgstr ""
msgid "Debug" msgid "Debug"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment