From 5d578b1320f96430bab763820f5789234d5a78f4 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Tue, 26 Nov 2024 21:02:37 +0100 Subject: [PATCH] fixup! feat: add availability action to the contacts menu --- appinfo/info.xml | 3 - .../AvailabilityModalProvider.php | 55 ------------------- src/utils/localization.js | 6 +- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 lib/ContactsMenu/AvailabilityModalProvider.php diff --git a/appinfo/info.xml b/appinfo/info.xml index 69ee28075a..17ed9b4f2a 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -56,7 +56,4 @@ 5 - - OCA\Calendar\ContactsMenu\AvailabilityModalProvider - diff --git a/lib/ContactsMenu/AvailabilityModalProvider.php b/lib/ContactsMenu/AvailabilityModalProvider.php deleted file mode 100644 index 8bf9ddb69a..0000000000 --- a/lib/ContactsMenu/AvailabilityModalProvider.php +++ /dev/null @@ -1,55 +0,0 @@ -l10n = $l10nFactory->get(Application::APP_ID); - } - - public function process(IEntry $entry) { - $targetUserId = $entry->getProperty('UID'); - $targetUser = $this->userManager->get($targetUserId); - if ($targetUser === null) { - // Showing the availability only makes sense for users - return; - } - - // TODO: Come up with a better icon! - // The recent icon is already used for the local time entry. - $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/recent.svg')); - $profileActionText = $this->l10n->t('Show availability'); - - $action = $this->actionFactory->newJavascriptAction( - $iconUrl, - $profileActionText, - 'calendar-availability', - Application::APP_ID, - ); - $action->setPriority(-1000); - $entry->addAction($action); - } -} diff --git a/src/utils/localization.js b/src/utils/localization.js index a2142c54a5..af8f9bf209 100644 --- a/src/utils/localization.js +++ b/src/utils/localization.js @@ -24,11 +24,10 @@ const getLangConfigForVue2DatePicker = (momentLocale) => { const dateFormat = moment.localeData(momentLocale) .longDateFormat('L') .toUpperCase() - const months = getMonthNames() return { formatLocale: { - months, + months: getMonthNames(), monthsShort: getMonthNamesShort(), weekdays: getDayNames(), weekdaysShort: getDayNamesShort(), @@ -40,8 +39,7 @@ const getLangConfigForVue2DatePicker = (momentLocale) => { isPM: moment.localeData(momentLocale).isPM, }, yearFormat: 'YYYY', - months, // Use long names in month picker - monthFormat: 'MMMM', + monthFormat: 'MMM', monthBeforeYear: dateFormat.indexOf('M') < dateFormat.indexOf('Y'), } }