Merge pull request #30191 from nextcloud/backport/30157/stable22

nextcloud · Dec 11, 2021 · e9d52bb · e9d52bb
2 parents f79f930 + 1e77ba0
commit e9d52bb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 27 deletions.
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
diff --git 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
@@ -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
@@ -110,30 +110,24 @@ 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() {
-			// fallback to default in case of unavailable data
+			const weekdaysShort = window.dayNamesShort
+				? window.dayNamesShort // provided by nextcloud
+				: ['Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.']
+			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 {
-				days: window.dayNamesShort
-					? window.dayNamesShort // provided by nextcloud
-					: ['Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'],
-				months: window.monthNamesShort
-					? window.monthNamesShort // provided by nextcloud
-					: ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'],
-				placeholder: {
-					date: 'Select Date', // TODO: Translate
+				formatLocale: {
+					firstDayOfWeek,
+					monthsShort,
+					weekdaysMin: weekdaysShort,
+					weekdaysShort,
 				},
+				monthFormat: 'MMM',
 			}
 		},