diff --git a/apps/appstore/src/composables/useAppIcon.ts b/apps/appstore/src/composables/useAppIcon.ts index 647aed5da54eb..2567e0f9d336e 100644 --- a/apps/appstore/src/composables/useAppIcon.ts +++ b/apps/appstore/src/composables/useAppIcon.ts @@ -13,7 +13,7 @@ import logger from '../utils/logger.ts' /** * Get the app icon raw SVG for use with `NcIconSvgWrapper` (do never use without sanitizing) - * It has a fallback to the categroy icon. + * It has a fallback to the category icon. * * @param app The app to get the icon for */ diff --git a/apps/appstore/src/service/app-discover.ts b/apps/appstore/src/service/app-discover.ts index 740b1cfc9a3b5..d8aa3ca110f46 100644 --- a/apps/appstore/src/service/app-discover.ts +++ b/apps/appstore/src/service/app-discover.ts @@ -18,7 +18,7 @@ export async function getDiscoverElements() { throw new Error('No app discover elements available (empty response)') } - // Parse data to ensure dates are useable and then filter out expired or future elements + // Parse data to ensure dates are usable and then filter out expired or future elements const parsedElements = data.map(parseApiResponse) .filter(filterElements) diff --git a/apps/dav/lib/CalDAV/EventReader.php b/apps/dav/lib/CalDAV/EventReader.php index 857148b2ffd94..ad30508199e39 100644 --- a/apps/dav/lib/CalDAV/EventReader.php +++ b/apps/dav/lib/CalDAV/EventReader.php @@ -690,7 +690,7 @@ public function recurrenceAdvance(): void { $rdateDate = null; $eruleDate = null; $edateDate = null; - // evaludate if rrule is set and advance one interation past current date + // evaluate if rrule is set and advance one iteration past current date if ($this->rruleIterator !== null) { // forward rrule to the next future date while ($this->rruleIterator->valid() && $this->rruleIterator->current() <= $this->recurrenceCurrentDate) { @@ -698,7 +698,7 @@ public function recurrenceAdvance(): void { } $rruleDate = $this->rruleIterator->current(); } - // evaludate if rdate is set and advance one interation past current date + // evaluate if rdate is set and advance one iteration past current date if ($this->rdateIterator !== null) { // forward rdate to the next future date while ($this->rdateIterator->valid() && $this->rdateIterator->current() <= $this->recurrenceCurrentDate) { @@ -714,7 +714,7 @@ public function recurrenceAdvance(): void { $nextOccurrenceDate = $rdateDate; } - // evaludate if exrule is set and advance one interation past current date + // evaluate if exrule is set and advance one iteration past current date if ($this->eruleIterator !== null) { // forward exrule to the next future date while ($this->eruleIterator->valid() && $this->eruleIterator->current() <= $this->recurrenceCurrentDate) { @@ -722,7 +722,7 @@ public function recurrenceAdvance(): void { } $eruleDate = $this->eruleIterator->current(); } - // evaludate if exdate is set and advance one interation past current date + // evaluate if exdate is set and advance one iteration past current date if ($this->edateIterator !== null) { // forward exdate to the next future date while ($this->edateIterator->valid() && $this->edateIterator->current() <= $this->recurrenceCurrentDate) { @@ -730,7 +730,7 @@ public function recurrenceAdvance(): void { } $edateDate = $this->edateIterator->current(); } - // evaludate if exrule and exdate are set and set nextExDate to the first next date + // evaluate if exrule and exdate are set and set nextExDate to the first next date if ($eruleDate !== null && $edateDate !== null) { $nextExceptionDate = ($eruleDate <= $edateDate) ? $eruleDate : $edateDate; } elseif ($eruleDate !== null) { diff --git a/apps/dav/lib/Command/ImportCalendar.php b/apps/dav/lib/Command/ImportCalendar.php index 1475d26fbb648..b261fe840f846 100644 --- a/apps/dav/lib/Command/ImportCalendar.php +++ b/apps/dav/lib/Command/ImportCalendar.php @@ -76,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int if (!$this->userManager->userExists($userId)) { throw new InvalidArgumentException("User <$userId> not found."); } - // retrieve calendar and evaluate if import is supported and writeable + // retrieve calendar and evaluate if import is supported and writable $calendars = $this->calendarManager->getCalendarsForPrincipal('principals/users/' . $userId, [$calendarId]); if ($calendars === []) { throw new InvalidArgumentException("Calendar <$calendarId> not found"); @@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int throw new InvalidArgumentException("Calendar <$calendarId> doesn't support this function"); } if (!$calendar->isWritable()) { - throw new InvalidArgumentException("Calendar <$calendarId> is not writeable"); + throw new InvalidArgumentException("Calendar <$calendarId> is not writable"); } if ($calendar->isDeleted()) { throw new InvalidArgumentException("Calendar <$calendarId> is deleted"); diff --git a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php index 913ded880a05d..d8ba3e99ebbd8 100644 --- a/apps/dav/lib/Connector/Sabre/DavAclPlugin.php +++ b/apps/dav/lib/Connector/Sabre/DavAclPlugin.php @@ -112,7 +112,7 @@ public function beforeMethod(RequestInterface $request, ResponseInterface $respo // is calendars/users/bob or addressbooks/users/bob readable? $this->checkPrivileges($parentName, '{DAV:}read'); } elseif ($request->getMethod() === 'MKCALENDAR' || $request->getMethod() === 'MKCOL') { - // is calendars/users/bob or addressbooks/users/bob writeable? + // is calendars/users/bob or addressbooks/users/bob writable? $this->checkPrivileges($parentName, '{DAV:}write'); } } diff --git a/apps/files_sharing/src/components/SidebarTabExternal/SidebarTabExternalSection.vue b/apps/files_sharing/src/components/SidebarTabExternal/SidebarTabExternalSection.vue index 961a617964c81..24bd298207716 100644 --- a/apps/files_sharing/src/components/SidebarTabExternal/SidebarTabExternalSection.vue +++ b/apps/files_sharing/src/components/SidebarTabExternal/SidebarTabExternalSection.vue @@ -25,7 +25,7 @@ const props = defineProps({ }, }) -// TOOD: Remove with Vue 3 +// TODO: Remove with Vue 3 const sectionElement = ref() watchEffect(() => { if (sectionElement.value) { diff --git a/apps/files_sharing/src/services/SharingService.spec.ts b/apps/files_sharing/src/services/SharingService.spec.ts index 6840fc733670f..c9fce87ec46bb 100644 --- a/apps/files_sharing/src/services/SharingService.spec.ts +++ b/apps/files_sharing/src/services/SharingService.spec.ts @@ -284,7 +284,7 @@ describe('SharingService share to Node mapping', () => { id: 4, share_type: ShareType.User, parent: null, - remote: 'http://exampe.com', + remote: 'http://example.com', remote_id: '12345', share_token: 'share-token', name: '/test.md', @@ -303,7 +303,7 @@ describe('SharingService share to Node mapping', () => { id: 4, share_type: ShareType.User, parent: null, - remote: 'http://exampe.com', + remote: 'http://example.com', remote_id: '12345', share_token: 'share-token', name: '/test.md', diff --git a/apps/files_versions/src/components/VirtualScrolling.vue b/apps/files_versions/src/components/VirtualScrolling.vue index bf6f90c35bc1c..74dba47385d69 100644 --- a/apps/files_versions/src/components/VirtualScrolling.vue +++ b/apps/files_versions/src/components/VirtualScrolling.vue @@ -177,7 +177,7 @@ export default defineComponent({ .forEach((item) => (item.key = unusedTokens.pop() ?? Math.random().toString(36).substr(2))) // this._rowIdToKeyMap is created in the beforeCreate hook, so value changes are not tracked. - // Therefore, we wont trigger the computation of visibleSections again if we alter the value of this._rowIdToKeyMap. + // Therefore, we won't trigger the computation of visibleSections again if we alter the value of this._rowIdToKeyMap. // eslint-disable-next-line vue/no-side-effects-in-computed-properties this._rowIdToKeyMap = visibleItems.reduce((finalMapping, { id, key }) => ({ ...finalMapping, [`${id}`]: key }), {}) diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php index e0e738bf81237..1ccf1c822bd24 100644 --- a/apps/files_versions/tests/VersioningTest.php +++ b/apps/files_versions/tests/VersioningTest.php @@ -177,7 +177,7 @@ public static function versionsProvider(): array { ['version' => 4999997, 'path' => 'keep', 'size' => 1], ['version' => 4999995, 'path' => 'keep', 'size' => 1], ['version' => 4999994, 'path' => 'delete', 'size' => 1], - //next slice (60sec) starts at 4999990 keep one version every 10 secons + //next slice (60sec) starts at 4999990 keep one version every 10 seconds ['version' => 4999988, 'path' => 'keep', 'size' => 1], ['version' => 4999978, 'path' => 'keep', 'size' => 1], ['version' => 4999975, 'path' => 'delete', 'size' => 1], @@ -205,7 +205,7 @@ public static function versionsProvider(): array { ['version' => 4777201, 'path' => 'delete', 'size' => 1], ['version' => 4777501, 'path' => 'delete', 'size' => 1], ['version' => 4740000, 'path' => 'keep', 'size' => 1], - // final slice starts at 2408000 keep one version every 604800 secons + // final slice starts at 2408000 keep one version every 604800 seconds ['version' => 2408000, 'path' => 'keep', 'size' => 1], ['version' => 1803201, 'path' => 'delete', 'size' => 1], ['version' => 1803200, 'path' => 'keep', 'size' => 1], @@ -219,7 +219,7 @@ public static function versionsProvider(): array { [ [ // first slice (10sec) keep one version every 2 seconds - // next slice (60sec) starts at 4999990 keep one version every 10 secons + // next slice (60sec) starts at 4999990 keep one version every 10 seconds // next slice (3600sec) start at 4999940 keep one version every 60 seconds // next slice (86400sec) start at 4996400 keep one version every 3600 seconds ['version' => 4996400, 'path' => 'keep', 'size' => 1], @@ -237,7 +237,7 @@ public static function versionsProvider(): array { ['version' => 4777201, 'path' => 'delete', 'size' => 1], ['version' => 4777501, 'path' => 'delete', 'size' => 1], ['version' => 4740000, 'path' => 'keep', 'size' => 1], - // final slice starts at 2408000 keep one version every 604800 secons + // final slice starts at 2408000 keep one version every 604800 seconds ['version' => 2408000, 'path' => 'keep', 'size' => 1], ['version' => 1803201, 'path' => 'delete', 'size' => 1], ['version' => 1803200, 'path' => 'keep', 'size' => 1], @@ -256,7 +256,7 @@ public static function versionsProvider(): array { ['version' => 4999997, 'path' => 'keep', 'size' => 1], ['version' => 4999995, 'path' => 'keep', 'size' => 1], ['version' => 4999994, 'path' => 'delete', 'size' => 1], - //next slice (60sec) starts at 4999990 keep one version every 10 secons + //next slice (60sec) starts at 4999990 keep one version every 10 seconds ['version' => 4999988, 'path' => 'keep', 'size' => 1], ['version' => 4999978, 'path' => 'keep', 'size' => 1], //next slice (3600sec) start at 4999940 keep one version every 60 seconds @@ -270,7 +270,7 @@ public static function versionsProvider(): array { ['version' => 4777201, 'path' => 'delete', 'size' => 1], ['version' => 4777501, 'path' => 'delete', 'size' => 1], ['version' => 4740000, 'path' => 'keep', 'size' => 1], - // final slice starts at 2408000 keep one version every 604800 secons + // final slice starts at 2408000 keep one version every 604800 seconds ['version' => 2408000, 'path' => 'keep', 'size' => 1], ['version' => 1803201, 'path' => 'delete', 'size' => 1], ['version' => 1803200, 'path' => 'keep', 'size' => 1], diff --git a/apps/theming/README.md b/apps/theming/README.md index 49e0eede55828..9fee0c248a118 100644 --- a/apps/theming/README.md +++ b/apps/theming/README.md @@ -13,7 +13,7 @@ A reference to why it was very difficult to actually find good background pictur - Same for a good balance of different colors. - The photo needs to work as a background. Photos with objects focused in the middle don’t really work as they will be overlapped by the widgets and content anyway. - Especially the top part cannot have too much differing contrast, as then it’s not possible to see the navigation icons. -- Especially the top part should be either dark-ish or light-ish, but not a shade exactly inbetween because then contrast can neither be achieved with light nor dark icons. +- Especially the top part should be either dark-ish or light-ish, but not a shade exactly in between because then contrast can neither be achieved with light nor dark icons. - We serve the pictures at 4k resolution and most of the selected images are also available in 6k or higher so it is future-proof. - For the search of course we had to limit to CC0, CC By and CC By-Sa. Only CC0 would have been practically impossible cause there’s just not so many good ones which fit. - Good pages to find photos are [StockSnap](https://stocksnap.io), [Wikimedia Commons](https://commons.wikimedia.org), [Openverse](https://wordpress.org/openverse/) and [Flickr (with license "commercial use & mods allowed")](https://flickr.com/search/?license=4%2C5%2C9%2C10&text=Nextcloud), sorting by interesting or downloads. Most others like Unsplash, Pexels, Pixabay, etc. meanwhile have a non-standard license. @@ -29,8 +29,8 @@ A reference to why it was very difficult to actually find good background pictur In `img/background/`: -- Default background: [Fluid (Jo Myoung Hee - Nextcloud GmbH, CC-BY-SA-4.0)](https://nextcloud.com/trademarks/) - orginal 4k -- [Globe (Jenna Kim - Nextcloud GmbH, CC-BY-SA-4.0)](https://nextcloud.com/trademarks/) - orginal 4k +- Default background: [Fluid (Jo Myoung Hee - Nextcloud GmbH, CC-BY-SA-4.0)](https://nextcloud.com/trademarks/) - original 4k +- [Globe (Jenna Kim - Nextcloud GmbH, CC-BY-SA-4.0)](https://nextcloud.com/trademarks/) - original 4k - [Clouds (Kamil Porembiński, CC BY-SA)](https://www.flickr.com/photos/paszczak000/8715851521/) – original 4k, color modified and sky color changed to Nextcloud blue. - [Pedra azul milky way (Eduardo Neves, CC BY-SA)](https://commons.wikimedia.org/wiki/File:Pedra_Azul_Milky_Way.jpg) – original 5k. - [Soft floral (Hannah MacLean, CC0)](https://stocksnap.io/photo/soft-floral-XOYWCCW5PA) – original 5.5k. diff --git a/apps/theming/lib/Service/BackgroundService.php b/apps/theming/lib/Service/BackgroundService.php index 7108d521be3da..487b5b45462c7 100644 --- a/apps/theming/lib/Service/BackgroundService.php +++ b/apps/theming/lib/Service/BackgroundService.php @@ -82,7 +82,7 @@ class BackgroundService { ], 'hannah-maclean-soft-floral.jpg' => [ 'attribution' => 'Soft floral (Hannah MacLean, CC0)', - 'description' => 'Abstract background picture in yellow and white color whith a flower on it', + 'description' => 'Abstract background picture in yellow and white color with a flower on it', 'attribution_url' => 'https://stocksnap.io/photo/soft-floral-XOYWCCW5PA', 'background_color' => '#e4d2c1', 'primary_color' => '#9f652f', diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php index b7f1ad86a1cca..6051999e6a663 100644 --- a/apps/theming/lib/Util.php +++ b/apps/theming/lib/Util.php @@ -171,7 +171,7 @@ public function calculateLuma(string $color): float { } /** - * Calculat the color contrast according to WCAG 2 + * Calculate the color contrast according to WCAG 2 * http://www.w3.org/TR/WCAG20/#contrast-ratiodef * @param string $color1 The first color * @param string $color2 The second color diff --git a/apps/theming/src/components/AdminSectionAppMenu.vue b/apps/theming/src/components/AdminSectionAppMenu.vue index 1a39795f97122..7b1df1ff28ea5 100644 --- a/apps/theming/src/components/AdminSectionAppMenu.vue +++ b/apps/theming/src/components/AdminSectionAppMenu.vue @@ -29,7 +29,7 @@ const allApps = loadState('core', 'apps') .map(({ id, name, icon }) => ({ label: name, id, icon })) /** - * Currently selected app, wrapps the setter + * Currently selected app, wraps the setter */ const selectedApps = ref(defaultApps.map((id) => allApps.find((app) => app.id === id)!).filter(Boolean)) watch(selectedApps, async (value) => { diff --git a/core/Service/LoginFlowV2Service.php b/core/Service/LoginFlowV2Service.php index 5d6048230c638..5d46bc505bc31 100644 --- a/core/Service/LoginFlowV2Service.php +++ b/core/Service/LoginFlowV2Service.php @@ -111,7 +111,7 @@ public function getByLoginToken(string $loginToken): LoginFlowV2 { /** * @param string $loginToken - * @return bool returns true if the start was successfull. False if not. + * @return bool returns true if the start was successful. False if not. */ public function startLoginFlow(string $loginToken): bool { try { diff --git a/core/src/OC/msg.ts b/core/src/OC/msg.ts index 0bc6fa851b6eb..0dc0d00467cd6 100644 --- a/core/src/OC/msg.ts +++ b/core/src/OC/msg.ts @@ -12,7 +12,7 @@ import { t } from '@nextcloud/l10n' */ export default { /** - * Displayes a "Saving..." message in the given message placeholder + * Displays a "Saving..." message in the given message placeholder * * @param selector - Query selectior for the element to display the message in */ @@ -21,7 +21,7 @@ export default { }, /** - * Displayes a custom message in the given message placeholder + * Displays a custom message in the given message placeholder * * @param selector - Query selectior for the element to display the message in * @param message - Plain text message to display (no HTML allowed) @@ -40,7 +40,7 @@ export default { }, /** - * Displayes an success/error message in the given selector + * Displays an success/error message in the given selector * * @param selector - Query selectior for the element to display the message in * @param response - Response of the server @@ -53,7 +53,7 @@ export default { }, /** - * Displayes an success/error message in the given selector + * Displays an success/error message in the given selector * * @param selector - Query selector for the element to display the message in * @param response - Response of the server @@ -70,7 +70,7 @@ export default { }, /** - * Displayes an success message in the given selector + * Displays an success message in the given selector * * @param selector - Query selector for the element to display the message in * @param message - Plain text success message to display (no HTML allowed) @@ -121,7 +121,7 @@ export default { }, /** - * Displayes an error message in the given selector + * Displays an error message in the given selector * * @param selector - Query selector for the element to display the message in * @param message - Plain text error message to display (no HTML allowed) diff --git a/core/src/ajax-cron.ts b/core/src/ajax-cron.ts index f11e440196aeb..78a15f7a6fa76 100644 --- a/core/src/ajax-cron.ts +++ b/core/src/ajax-cron.ts @@ -11,7 +11,7 @@ window.addEventListener('DOMContentLoaded', async () => { try { logger.debug('Running web cron') await window.fetch(`${getRootUrl()}/cron.php`) - logger.debug('Web cron successfull') + logger.debug('Web cron successful') } catch (e) { logger.debug('Running web cron failed', { error: e }) } diff --git a/lib/private/Mail/Mailer.php b/lib/private/Mail/Mailer.php index da61abb7dd4d5..d4dcd15059b37 100644 --- a/lib/private/Mail/Mailer.php +++ b/lib/private/Mail/Mailer.php @@ -275,7 +275,7 @@ protected function getInstance(): MailerInterface { * Returns the SMTP transport * * Only supports ssl/tls - * starttls is not enforcable with Symfony Mailer but might be available + * starttls is not enforceable with Symfony Mailer but might be available * via the automatic config (Symfony Mailer internal) * * @return EsmtpTransport diff --git a/lib/private/Mail/Message.php b/lib/private/Mail/Message.php index b19570c9cc075..80a29df285fb2 100644 --- a/lib/private/Mail/Message.php +++ b/lib/private/Mail/Message.php @@ -58,14 +58,14 @@ public function attachInline(string $body, string $name, ?string $contentType = # quoted-printable encoding. We save the current encoder, replace the current # encoder with an 8bit encoder and after we've finished, we reset the encoder # to the previous one. Originally intended to be added after the message body, - # as it is curently unknown if all mail clients handle this properly if added + # as it is currently unknown if all mail clients handle this properly if added # before. $this->symfonyEmail->embed($body, $name, $contentType); return $this; } /** - * Converts the [['displayName' => 'email'], ['displayName2' => 'email2']] arrays to valid Adresses + * Converts the [['displayName' => 'email'], ['displayName2' => 'email2']] arrays to valid Addresses * * @param array $addresses Array of mail addresses * @return Address[] @@ -308,7 +308,7 @@ public function setAutoSubmitted(string $value): IMessage { $headers = $this->symfonyEmail->getHeaders(); if ($headers->has(AutoSubmitted::HEADER)) { - // if the header already exsists, remove it. + // if the header already exists, remove it. // the value can be modified with some implementations // of the interface \Swift_Mime_Header, however the // interface doesn't, and this makes the static-code diff --git a/lib/private/Mail/Provider/Manager.php b/lib/private/Mail/Provider/Manager.php index 706f944ace8ed..9bfb97cc0502b 100644 --- a/lib/private/Mail/Provider/Manager.php +++ b/lib/private/Mail/Provider/Manager.php @@ -96,7 +96,7 @@ public function providers(): array { if ($context === null) { return []; } - // initilize cached collection + // initialize cached collection $this->providersCollection = []; // iterate through all registered mail providers foreach ($context->getMailProviders() as $entry) { @@ -153,7 +153,7 @@ public function findProviderById(string $providerId): ?IProvider { #[\Override] public function services(string $userId): array { - // initilize collection + // initialize collection $services = []; // retrieve and iterate through mail providers foreach ($this->providers() as $entry) { diff --git a/lib/private/Session/CryptoSessionData.php b/lib/private/Session/CryptoSessionData.php index 2e6675f3c1c58..748373cbec993 100644 --- a/lib/private/Session/CryptoSessionData.php +++ b/lib/private/Session/CryptoSessionData.php @@ -171,7 +171,7 @@ public function reopen(): bool { * Wrapper around session_regenerate_id * * @param bool $deleteOldSession Whether to delete the old associated session file or not. - * @param bool $updateToken Wheater to update the associated auth token + * @param bool $updateToken Whether to update the associated auth token * @return void */ #[\Override] diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php index 5c3336140e890..b41ab94dbd850 100644 --- a/lib/public/IUserManager.php +++ b/lib/public/IUserManager.php @@ -172,7 +172,7 @@ public function createUserFromBackend($uid, $password, UserInterface $backend); public function countUsers(bool $onlyMappedUsers = false); /** - * Get how many users exists in total, whithin limit + * Get how many users exists in total, within limit * * @param int $limit Limit the count to avoid resource waste. 0 to disable * @param bool $onlyMappedUsers Count mapped users instead of all users for compatible backends