Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf8e4a0 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

upgrade to 4.52

parent bfd05637

src/utils/moment.js

+0 −19
Original line number Diff line number Diff line
@@ -83,24 +83,6 @@ async function getLocaleFor(locale) { 
	} catch (error) {

		const splitLocale = locale.split('-')

		try {

<<<<<<< HEAD

			// failure: fallback to de

			locale = splitLocale[1]

			await import(`moment/locale/${locale}.js`)

			return locale

		} catch (e) {

			try {

				// failure: fallback to en

				locale = splitLocale[0]

				await import(`moment/locale/${locale}.js`)

				return locale

			} catch (e) {

				// failure, fallback to english

				console.debug('Fallback to locale', 'en')

				// English is the default locale and doesn't need to imported.

				// It is already included in moment.js.

			}

=======

			// failure: fallback to first part of locale, which

			// should be language

			locale = splitLocale[0]
@@ -111,7 +93,6 @@ async function getLocaleFor(locale) { 
			console.debug('Fallback to locale', 'en')

			// English is the default locale and doesn't need to imported.

			// It is already included in moment.js.

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

		}

	}

src/views/Appointments/Booking.vue

+0 −11
Original line number Diff line number Diff line
@@ -75,10 +75,7 @@ 
					:visitor-info="visitorInfo"

					:time-zone-id="timeZone"

					:show-error="bookingError"

<<<<<<< HEAD

=======

					:is-loading="bookingLoading"

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

					@save="onSave"

					@close="selectedSlot = undefined" />

			</div>
@@ -89,13 +86,6 @@ 
</template>



<script>

<<<<<<< HEAD

import Avatar from '@nextcloud/vue/dist/Components/NcAvatar.js'

import DatetimePicker from '@nextcloud/vue/dist/Components/NcDatetimePicker.js'

import jstz from 'jstz'

import TimezonePicker from '@nextcloud/vue/dist/Components/NcTimezonePicker.js'

import NcGuestContent from '@nextcloud/vue/dist/Components/NcGuestContent.js'

=======

import {

	NcAvatar as Avatar,

	NcDatetimePicker as DatetimePicker,
@@ -103,7 +93,6 @@ import { 
	NcGuestContent,

} from '@nextcloud/vue'

import jstz from 'jstz'

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4



import AppointmentSlot from '../../components/Appointments/AppointmentSlot.vue'

import { bookSlot, findSlots } from '../../services/appointmentService.js'

src/views/Appointments/Overview.vue

+0 −5
Original line number Diff line number Diff line
@@ -62,15 +62,10 @@ 
</template>



<script>

<<<<<<< HEAD

import Avatar from '@nextcloud/vue/dist/Components/NcAvatar.js'

import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'

=======

import {

	NcAvatar as Avatar,

	NcEmptyContent as EmptyContent,

} from '@nextcloud/vue'

>>>>>>> 956826ca66b66de76eb7561ddf0ad088428115c4

import { generateUrl } from '@nextcloud/router'

import CalendarCheckIcon from 'vue-material-design-icons/CalendarCheck.vue'

import CalendarBlankIcon from 'vue-material-design-icons/CalendarBlank.vue'