diff options
| author | John Molakvoæ <skjnldsv@protonmail.com> | 2021-12-09 09:07:32 +0100 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2021-12-09 09:07:32 +0100 |
| commit | 3a4179d8164c2647d65a92e1be5c29470554f284 (patch) | |
| tree | 6f6ef35c43f8d6e80e7ba8457fb846979fef4de9 /apps/files_sharing/src | |
| parent | 22390479274c231d07f03fdc567dc87f010befbd (diff) | |
| download | nextcloud-server-3a4179d8164c2647d65a92e1be5c29470554f284.tar.gz nextcloud-server-3a4179d8164c2647d65a92e1be5c29470554f284.zip | |
Fix first day locale
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files_sharing/src')
| -rw-r--r-- | apps/files_sharing/src/components/SharingEntry.vue | 1 | ||||
| -rw-r--r-- | apps/files_sharing/src/components/SharingEntryLink.vue | 3 | ||||
| -rw-r--r-- | apps/files_sharing/src/mixins/SharesMixin.js | 21 |
3 files changed, 5 insertions, 20 deletions
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue index 8167172ceea..ac7df24162c 100644 --- a/apps/files_sharing/src/components/SharingEntry.vue +++ b/apps/files_sharing/src/components/SharingEntry.vue @@ -100,7 +100,6 @@ }" :class="{ error: errors.expireDate}" :disabled="saving" - :first-day-of-week="firstDay" :lang="lang" :value="share.expireDate" value-type="format" diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue index d860ee20805..3acd1a8652f 100644 --- a/apps/files_sharing/src/components/SharingEntryLink.vue +++ b/apps/files_sharing/src/components/SharingEntryLink.vue @@ -105,7 +105,7 @@ }" class="share-link-expire-date" :disabled="saving" - :first-day-of-week="firstDay" + :lang="lang" icon="" type="date" @@ -251,7 +251,6 @@ class="share-link-expire-date" :class="{ error: errors.expireDate}" :disabled="saving" - :first-day-of-week="firstDay" :lang="lang" :value="share.expireDate" value-type="format" diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js index 8fe6388e45b..15d3e2712cf 100644 --- a/apps/files_sharing/src/mixins/SharesMixin.js +++ b/apps/files_sharing/src/mixins/SharesMixin.js @@ -110,19 +110,6 @@ export default { return moment().add(1, 'days') }, - /** - * Datepicker lang values - * https://github.com/nextcloud/nextcloud-vue/pull/146 - * TODO: have this in vue-components - * - * @returns {int} - */ - firstDay() { - return window.firstDay - ? window.firstDay - : 0 // sunday as default - }, - // Datepicker language lang() { const weekdaysShort = window.dayNamesShort @@ -131,16 +118,16 @@ export default { const monthsShort = window.monthNamesShort ? window.monthNamesShort // provided by nextcloud : ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'] + const firstDayOfWeek = window.firstDay ? window.firstDay : 0 return { formatLocale: { + firstDayOfWeek, + monthsShort, weekdaysMin: weekdaysShort, weekdaysShort, - monthsShort, - }, - placeholder: { - date: t('files_sharing', 'Select Date'), }, + monthFormat: 'MMM', } }, |