diff options
author | Carl Schwan <carl@carlschwan.eu> | 2022-09-06 10:28:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-06 10:28:26 +0200 |
commit | ba99f1ca0ffd128c1cd3d13c0a5735fe14bc12e5 (patch) | |
tree | e417a60ccd830738dae1a6adc6b778fb0c4548ab /apps | |
parent | 405edfa90c851937af13e26a82754310ded0072a (diff) | |
parent | 9d26671f05275055619960a66981201ed660bdd2 (diff) | |
download | nextcloud-server-ba99f1ca0ffd128c1cd3d13c0a5735fe14bc12e5.tar.gz nextcloud-server-ba99f1ca0ffd128c1cd3d13c0a5735fe14bc12e5.zip |
Merge pull request #33895 from nextcloud/fix/fix-apps-typos
Fix typos in apps/ subdirectory
Diffstat (limited to 'apps')
56 files changed, 74 insertions, 74 deletions
diff --git a/apps/cloud_federation_api/README.md b/apps/cloud_federation_api/README.md index 34b5045eaf9..d10071c8758 100644 --- a/apps/cloud_federation_api/README.md +++ b/apps/cloud_federation_api/README.md @@ -1,2 +1,2 @@ # cloud_federation_api -The cloud federation API allows to share information like files, contacts, calendars, incoming calls, etc accross Nextcloud instances +The cloud federation API allows to share information like files, contacts, calendars, incoming calls, etc across Nextcloud instances diff --git a/apps/comments/src/activitytabviewplugin.js b/apps/comments/src/activitytabviewplugin.js index 5c1daba1c1c..6b6e7ccda90 100644 --- a/apps/comments/src/activitytabviewplugin.js +++ b/apps/comments/src/activitytabviewplugin.js @@ -31,7 +31,7 @@ * * @param {OCA.Activity.ActivityModel} model for this activity * @param {jQuery} $el jQuery handle for this activity - * @param {string} view The view that displayes this activity + * @param {string} view The view that displays this activity */ prepareModelForDisplay(model, $el, view) { if (model.get('app') !== 'comments' || model.get('type') !== 'comments') { diff --git a/apps/comments/src/services/GetComments.js b/apps/comments/src/services/GetComments.js index 4d1f7b022ae..7dffa969a69 100644 --- a/apps/comments/src/services/GetComments.js +++ b/apps/comments/src/services/GetComments.js @@ -50,7 +50,7 @@ export default async function({ commentsType, ressourceId }, options = {}) { <oc:offset>${options.offset || 0}</oc:offset> </oc:filter-comments>`, }, options)) - // See example on how it's done normaly + // See example on how it's done normally // https://github.com/perry-mitchell/webdav-client/blob/9de2da4a2599e06bd86c2778145b7ade39fe0b3c/source/interface/stat.js#L19 // Waiting for proper REPORT integration https://github.com/perry-mitchell/webdav-client/issues/207 .then(res => { diff --git a/apps/dav/lib/DAV/SystemPrincipalBackend.php b/apps/dav/lib/DAV/SystemPrincipalBackend.php index 07431feb6dd..d5739212e86 100644 --- a/apps/dav/lib/DAV/SystemPrincipalBackend.php +++ b/apps/dav/lib/DAV/SystemPrincipalBackend.php @@ -60,7 +60,7 @@ class SystemPrincipalBackend extends AbstractBackend { } /** - * Returns a specific principal, specified by it's path. + * Returns a specific principal, specified by its path. * The returned structure should be the exact same as from * getPrincipalsByPrefix. * diff --git a/apps/dav/lib/Listener/CalendarShareUpdateListener.php b/apps/dav/lib/Listener/CalendarShareUpdateListener.php index 88865759162..dd046ddd66a 100644 --- a/apps/dav/lib/Listener/CalendarShareUpdateListener.php +++ b/apps/dav/lib/Listener/CalendarShareUpdateListener.php @@ -50,7 +50,7 @@ class CalendarShareUpdateListener implements IEventListener { return; } - $this->logger->debug("Creating activity for Calendar having it's shares updated"); + $this->logger->debug("Creating activity for Calendar having its shares updated"); $this->activityBackend->onCalendarUpdateShares( $event->getCalendarData(), diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index 13025415f2a..7cf04ef5e70 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -55,7 +55,7 @@ class CalDavBackendTest extends AbstractCalDavBackend { public function testCalendarOperations() { $calendarId = $this->createTestCalendar(); - // update it's display name + // update its display name $patch = new PropPatch([ '{DAV:}displayname' => 'Unit test', '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar used for unit testing' diff --git a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php index b468a2a65ae..63030910b50 100644 --- a/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php +++ b/apps/dav/tests/unit/CardDAV/CardDavBackendTest.php @@ -193,7 +193,7 @@ class CardDavBackendTest extends TestCase { $this->assertEquals('Example', $books[0]['{DAV:}displayname']); $this->assertEquals('User\'s displayname', $books[0]['{http://nextcloud.com/ns}owner-displayname']); - // update it's display name + // update its display name $patch = new PropPatch([ '{DAV:}displayname' => 'Unit test', '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'Addressbook used for unit testing' diff --git a/apps/encryption/lib/KeyManager.php b/apps/encryption/lib/KeyManager.php index ffd07c0f323..2c6487d062a 100644 --- a/apps/encryption/lib/KeyManager.php +++ b/apps/encryption/lib/KeyManager.php @@ -623,7 +623,7 @@ class KeyManager { } /** - * creat a backup of the users private and public key and then delete it + * create a backup of the users private and public key and then delete it * * @param string $uid */ diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php index d504a3e2acc..75bc6261756 100644 --- a/apps/federatedfilesharing/lib/FederatedShareProvider.php +++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php @@ -969,7 +969,7 @@ class FederatedShareProvider implements IShareProvider { * @param int $shareType */ public function userDeleted($uid, $shareType) { - //TODO: probabaly a good idea to send unshare info to remote servers + //TODO: probably a good idea to send unshare info to remote servers $qb = $this->dbConnection->getQueryBuilder(); diff --git a/apps/federation/js/settings-admin.js b/apps/federation/js/settings-admin.js index d8ec194dcda..fed0f441e01 100644 --- a/apps/federation/js/settings-admin.js +++ b/apps/federation/js/settings-admin.js @@ -69,7 +69,7 @@ var url = $(this).val(); - // toggle add-button visiblity based on input length + // toggle add-button visibility based on input length if ( url.length > 0 ) $btnSubmit.removeClass("hidden") else diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php index 2080418af61..13ac9178eda 100644 --- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php +++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php @@ -155,7 +155,7 @@ class RequestSharedSecret extends Job { $endPoints = $this->ocsDiscoveryService->discover($target, 'FEDERATED_SHARING'); $endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint; - // make sure that we have a well formated url + // make sure that we have a well formatted url $url = rtrim($target, '/') . '/' . trim($endPoint, '/'); try { diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 075646cae80..416d744b502 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -1062,7 +1062,7 @@ table.dragshadow td.size { overflow: hidden; // we but the thumbnail in background to ensure // the name is the default click handler - // force back the cursor which have been overrided + // force back the cursor which has been overridden // and disabled for some reason... cursor: pointer !important; diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 5386d6ee4a4..1083be461bb 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -320,7 +320,7 @@ // depending on whether the menu was previously being shown or not. this.$el.find('.crumbmenu').addClass('hidden'); - // Show the crumbs to compress the siblings before hidding again the + // Show the crumbs to compress the siblings before hiding again the // crumbs. This is needed when the siblings expand to fill all the // available width, as in that case their old width would limit the // available width for the crumbs. diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index dc38f731108..69f9d9d0e63 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -12,7 +12,7 @@ * The file upload code uses several hooks to interact with blueimps jQuery file upload library: * 1. the core upload handling hooks are added when initializing the plugin, * 2. if the browser supports progress events they are added in a separate set after the initialization - * 3. every app can add it's own triggers for fileupload + * 3. every app can add its own triggers for fileupload * - files adds d'n'd handlers and also reacts to done events to add new rows to the filelist * - TODO pictures upload button * - TODO music upload button diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index d60def34ebf..77f67c64ed7 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2591,7 +2591,7 @@ * @param fileNames array of file names to move * @param targetPath absolute target path * @param callback function to call when movement is finished - * @param dir the dir path where fileNames are located (optionnal, will take current folder if undefined) + * @param dir the dir path where fileNames are located (optional, will take current folder if undefined) */ move: function(fileNames, targetPath, callback, dir) { var self = this; @@ -2683,7 +2683,7 @@ * @param fileNames array of file names to copy * @param targetPath absolute target path * @param callback to call when copy is finished with success - * @param dir the dir path where fileNames are located (optionnal, will take current folder if undefined) + * @param dir the dir path where fileNames are located (optional, will take current folder if undefined) */ copy: function(fileNames, targetPath, callback, dir) { var self = this; @@ -2712,7 +2712,7 @@ if ( dotIndex > 1) { var leftPartOfName = targetPathAndName.substr(0, dotIndex); var fileNumber = leftPartOfName.match(/\d+/); - // TRANSLATORS name that is appended to copied files with the same name, will be put in parenthesis and appened with a number if it is the second+ copy + // TRANSLATORS name that is appended to copied files with the same name, will be put in parenthesis and appended with a number if it is the second+ copy var copyNameLocalized = t('files', 'copy'); if (isNaN(fileNumber) ) { fileNumber++; diff --git a/apps/files/js/jquery.fileupload.js b/apps/files/js/jquery.fileupload.js index cc0c97ba3ed..9b382ccae39 100644 --- a/apps/files/js/jquery.fileupload.js +++ b/apps/files/js/jquery.fileupload.js @@ -420,7 +420,7 @@ _initProgressListener: function (options) { var that = this, xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr(); - // Accesss to the native XHR object is required to add event listeners + // Access to the native XHR object is required to add event listeners // for the upload progress event: if (xhr.upload) { $(xhr.upload).bind('progress', function (e) { @@ -1060,7 +1060,7 @@ data.fileInputClone = inputClone; $('<form></form>').append(inputClone)[0].reset(); // Detaching allows to insert the fileInput on another form - // without loosing the file input value: + // without losing the file input value: input.after(inputClone).detach(); // If the fileInput had focus before it was detached, // restore focus to the inputClone. @@ -1138,7 +1138,7 @@ dirReader = entry.createReader(); readEntries(); } else { - // Return an empy list for file system items + // Return an empty list for file system items // other than files or directories: dfd.resolve([]); } diff --git a/apps/files/lib/Command/RepairTree.php b/apps/files/lib/Command/RepairTree.php index 4fe64ef0edf..521fe3d6a4a 100644 --- a/apps/files/lib/Command/RepairTree.php +++ b/apps/files/lib/Command/RepairTree.php @@ -68,7 +68,7 @@ class RepairTree extends Command { ->where($query->expr()->eq('fileid', $query->createParameter('fileid'))); foreach ($rows as $row) { - $output->writeln("Path of file {$row['fileid']} is {$row['path']} but should be {$row['parent_path']}/{$row['name']} based on it's parent", OutputInterface::VERBOSITY_VERBOSE); + $output->writeln("Path of file {$row['fileid']} is {$row['path']} but should be {$row['parent_path']}/{$row['name']} based on its parent", OutputInterface::VERBOSITY_VERBOSE); if ($fix) { $fileId = $this->getFileId((int)$row['parent_storage'], $row['parent_path'] . '/' . $row['name']); diff --git a/apps/files/lib/Controller/ApiController.php b/apps/files/lib/Controller/ApiController.php index 45c7466e0c2..e29e81d6296 100644 --- a/apps/files/lib/Controller/ApiController.php +++ b/apps/files/lib/Controller/ApiController.php @@ -247,7 +247,7 @@ class ApiController extends Controller { } /** - * Returns a list of recently modifed files. + * Returns a list of recently modified files. * * @NoAdminRequired * diff --git a/apps/files/lib/Notification/Notifier.php b/apps/files/lib/Notification/Notifier.php index 8f885a995f9..1a7a3726229 100644 --- a/apps/files/lib/Notification/Notifier.php +++ b/apps/files/lib/Notification/Notifier.php @@ -278,7 +278,7 @@ class Notifier implements INotifier, IDismissableNotifier { throw new \InvalidArgumentException('Unhandled app'); } - // TODO: This should all be moved to a service that also the transferownershipContoller uses. + // TODO: This should all be moved to a service that also the transferownershipController uses. try { $transferOwnership = $this->mapper->getById((int)$notification->getObjectId()); } catch (DoesNotExistException $e) { diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue index 78713bdd5c6..d4bf8cfde40 100644 --- a/apps/files/src/views/Sidebar.vue +++ b/apps/files/src/views/Sidebar.vue @@ -456,7 +456,7 @@ export default { /** * Allow to set the Sidebar as fullscreen from OCA.Files.Sidebar * - * @param {boolean} isFullScreen - Wether or not to render the Sidebar in fullscreen. + * @param {boolean} isFullScreen - Whether or not to render the Sidebar in fullscreen. */ setFullScreenMode(isFullScreen) { this.isFullScreen = isFullScreen diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index b1153fc0a01..a302121ae0d 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -266,7 +266,7 @@ describe('OCA.Files.FileList tests', function() { type: OCA.Files.FileActions.TYPE_INLINE, permissions: OC.PERMISSION_ALL, icon: function() { - // Specify icon for hitory button + // Specify icon for history button return OC.imagePath('core','actions/history'); }, actionHandler: actionStub @@ -2474,7 +2474,7 @@ describe('OCA.Files.FileList tests', function() { type: OCA.Files.FileActions.TYPE_INLINE, permissions: OC.PERMISSION_ALL, icon: function() { - // Specify icon for hitory button + // Specify icon for history button return OC.imagePath('core','actions/history'); }, actionHandler: actionStub @@ -2539,7 +2539,7 @@ describe('OCA.Files.FileList tests', function() { type: OCA.Files.FileActions.TYPE_INLINE, permissions: OC.PERMISSION_ALL, icon: function() { - // Specify icon for hitory button + // Specify icon for history button return OC.imagePath('core','actions/history'); }, actionHandler: actionStub diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php index 89939640acc..2630fcc365a 100644 --- a/apps/files_external/lib/Controller/GlobalStoragesController.php +++ b/apps/files_external/lib/Controller/GlobalStoragesController.php @@ -145,7 +145,7 @@ class GlobalStoragesController extends StoragesController { * @param int $id storage id * @param string $mountPoint storage mount point * @param string $backend backend identifier - * @param string $authMechanism authentication mechansim identifier + * @param string $authMechanism authentication mechanism identifier * @param array $backendOptions backend-specific options * @param array $mountOptions mount-specific options * @param array $applicableUsers users for which to mount the storage diff --git a/apps/files_external/lib/Lib/Auth/AuthMechanism.php b/apps/files_external/lib/Lib/Auth/AuthMechanism.php index 210dd705723..929068ea7ef 100644 --- a/apps/files_external/lib/Lib/Auth/AuthMechanism.php +++ b/apps/files_external/lib/Lib/Auth/AuthMechanism.php @@ -37,7 +37,7 @@ use OCA\Files_External\Lib\VisibilityTrait; * such as \OCP\IDB for database operations. This allows an authentication * mechanism to perform advanced operations based on provided information. * - * An authenication scheme defines the parameter interface, common to the + * An authentication scheme defines the parameter interface, common to the * storage implementation, the backend and the authentication mechanism. * A storage implementation expects parameters according to the authentication * scheme, which are provided from the authentication mechanism. diff --git a/apps/files_external/lib/Lib/Backend/Backend.php b/apps/files_external/lib/Lib/Backend/Backend.php index 021d208aed3..053d9b87952 100644 --- a/apps/files_external/lib/Lib/Backend/Backend.php +++ b/apps/files_external/lib/Lib/Backend/Backend.php @@ -38,7 +38,7 @@ use OCA\Files_External\Lib\VisibilityTrait; * such as \OCP\IDB for database operations. This allows a backend * to perform advanced operations based on provided information. * - * An authenication scheme defines the parameter interface, common to the + * An authentication scheme defines the parameter interface, common to the * storage implementation, the backend and the authentication mechanism. * A storage implementation expects parameters according to the authentication * scheme, which are provided from the authentication mechanism. diff --git a/apps/files_external/lib/Lib/StorageConfig.php b/apps/files_external/lib/Lib/StorageConfig.php index 26ba483b00e..20e5aea62d2 100644 --- a/apps/files_external/lib/Lib/StorageConfig.php +++ b/apps/files_external/lib/Lib/StorageConfig.php @@ -261,7 +261,7 @@ class StorageConfig implements \JsonSerializable { } /** - * Sets the mount priotity + * Sets the mount priority * * @param int $priority priority */ diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php index 489192dbdc2..eaa2ebf7e95 100644 --- a/apps/files_external/lib/Service/StoragesService.php +++ b/apps/files_external/lib/Service/StoragesService.php @@ -345,7 +345,7 @@ abstract class StoragesService { * Triggers the given hook signal for all the applicables given * * @param string $signal signal - * @param string $mountPoint hook mount pount param + * @param string $mountPoint hook mount point param * @param string $mountType hook mount type param * @param array $applicableArray array of applicable users/groups for which to trigger the hook */ diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php index 17948c5275a..300b9f3f604 100644 --- a/apps/files_external/tests/Storage/SmbTest.php +++ b/apps/files_external/tests/Storage/SmbTest.php @@ -135,7 +135,7 @@ class SmbTest extends \Test\Files\Storage\Storage { $result = null; - // since the notify handler buffers untill we start listening we will get the above changes + // since the notify handler buffers until we start listening we will get the above changes $notifyHandler->listen(function (IChange $change) use (&$result) { $result = $change; return false;//stop listening diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js index 42151bca1cb..3ef2651d054 100644 --- a/apps/files_sharing/js/files_drop.js +++ b/apps/files_sharing/js/files_drop.js @@ -97,7 +97,7 @@ Drop.addFileToUpload(e, data); $('#drop-upload-status').text(t('files_sharing', 'Waiting…')); //we return true to keep trying to upload next file even - //if addFileToUpload did not like the privious one + //if addFileToUpload did not like the previous one return true; }, done: function(e, data) { diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php index 0025bb98fbb..aa45b6ab43e 100644 --- a/apps/files_sharing/lib/Cache.php +++ b/apps/files_sharing/lib/Cache.php @@ -77,7 +77,7 @@ class Cache extends CacheJail { // the sourceRootInfo path is the absolute path of the folder in the "real" storage // in the case where a folder is shared from a Jail we need to ensure that the share Jail - // has it's root set relative to the source Jail + // has its root set relative to the source Jail $currentStorage = $this->storage->getSourceStorage(); if ($currentStorage->instanceOfStorage(Jail::class)) { /** @var Jail $currentStorage */ diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 59089390667..ebc910063ef 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -382,7 +382,7 @@ class ShareAPIController extends OCSController { return new DataResponse([$share]); } } catch (NotFoundException $e) { - // Fall trough + // Fall through } throw new OCSNotFoundException($this->l->t('Wrong share ID, share does not exist')); @@ -1219,7 +1219,7 @@ class ShareAPIController extends OCSController { if ($label !== null) { if (strlen($label) > 255) { - throw new OCSBadRequestException("Maxmimum label length is 255"); + throw new OCSBadRequestException("Maximum label length is 255"); } $share->setLabel($label); } diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 87f143facd0..4a9ace47146 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -324,7 +324,7 @@ class ShareController extends AuthPublicShareController { * @return bool */ private function validateShare(\OCP\Share\IShare $share) { - // If the owner is disabled no access to the linke is granted + // If the owner is disabled no access to the link is granted $owner = $this->userManager->get($share->getShareOwner()); if ($owner === null || !$owner->isEnabled()) { return false; diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 60a292c498d..f4ad29cb74c 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -436,7 +436,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto public function getWatcher($path = '', $storage = null): Watcher { $mountManager = \OC::$server->getMountManager(); - // Get node informations + // Get node information $node = $this->getShare()->getNodeCacheEntry(); if ($node) { $mount = $mountManager->findByNumericId($node->getStorageId()); diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue index 07770e5a87c..3802b79db9e 100644 --- a/apps/files_sharing/src/components/SharingEntryLink.vue +++ b/apps/files_sharing/src/components/SharingEntryLink.vue @@ -824,7 +824,7 @@ export default { }, /** - * Menu have been closed or password has been submited. + * Menu have been closed or password has been submitted. * The only property that does not get * synced automatically is the password * So let's check if we have an unsaved diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index 905de91bff1..6c73180865e 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -249,7 +249,7 @@ export default { const allSuggestions = exactSuggestions.concat(suggestions).concat(externalResults).concat(lookupEntry) - // Count occurances of display names in order to provide a distinguishable description if needed + // Count occurrences of display names in order to provide a distinguishable description if needed const nameCounts = allSuggestions.reduce((nameCounts, result) => { if (!result.displayName) { return nameCounts @@ -383,7 +383,7 @@ export default { shareTypeToIcon(type) { switch (type) { case this.SHARE_TYPES.SHARE_TYPE_GUEST: - // default is a user, other icons are here to differenciate + // default is a user, other icons are here to differentiate // themselves from it, so let's not display the user icon // case this.SHARE_TYPES.SHARE_TYPE_REMOTE: // case this.SHARE_TYPES.SHARE_TYPE_USER: diff --git a/apps/files_sharing/src/models/Share.js b/apps/files_sharing/src/models/Share.js index e6512c67f8c..d28738d42cc 100644 --- a/apps/files_sharing/src/models/Share.js +++ b/apps/files_sharing/src/models/Share.js @@ -392,7 +392,7 @@ export default class Share { /** * Password expiration time * - * @param {string} password exipration time + * @param {string} password expiration time * @memberof Share */ set passwordExpirationTime(passwordExpirationTime) { diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index 2a03553801e..d312b096e0c 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -75,7 +75,7 @@ :name="fileInfo.name" /> </template> - <!-- additionnal entries, use it with cautious --> + <!-- additional entries, use it with cautious --> <div v-for="(section, index) in sections" :ref="'section-' + index" :key="index" diff --git a/apps/files_sharing/tests/ApiTest.php b/apps/files_sharing/tests/ApiTest.php index 98d0c171681..9b88297a309 100644 --- a/apps/files_sharing/tests/ApiTest.php +++ b/apps/files_sharing/tests/ApiTest.php @@ -54,7 +54,7 @@ use OCP\UserStatus\IManager as IUserStatusManager; * Class ApiTest * * @group DB - * TODO: convert to real intergration tests + * TODO: convert to real integration tests */ class ApiTest extends TestCase { public const TEST_FOLDER_NAME = '/folder_share_api_test'; diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php index 7252d2908ba..8b19a856dda 100644 --- a/apps/files_sharing/tests/SharedMountTest.php +++ b/apps/files_sharing/tests/SharedMountTest.php @@ -247,7 +247,7 @@ class SharedMountTest extends TestCase { if ($exception) { $this->assertSame(10, $e->getCode()); } else { - $this->assertTrue(false, 'Exception catched, but expected: ' . $expectedResult); + $this->assertTrue(false, 'Exception caught, but expected: ' . $expectedResult); } } } diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php index 975e9fd2557..46a2b07fc07 100644 --- a/apps/files_trashbin/lib/Trashbin.php +++ b/apps/files_trashbin/lib/Trashbin.php @@ -932,7 +932,7 @@ class Trashbin { * recursive copy to copy a whole directory * * @param string $source source path, relative to the users files directory - * @param string $destination destination path relative to the users root directoy + * @param string $destination destination path relative to the users root directory * @param View $view file view for the users root directory * @return int * @throws Exceptions\CopyRecursiveException diff --git a/apps/oauth2/lib/Controller/OauthApiController.php b/apps/oauth2/lib/Controller/OauthApiController.php index 392eb09e89e..910fdc99432 100644 --- a/apps/oauth2/lib/Controller/OauthApiController.php +++ b/apps/oauth2/lib/Controller/OauthApiController.php @@ -133,7 +133,7 @@ class OauthApiController extends Controller { $decryptedToken = $this->crypto->decrypt($accessToken->getEncryptedToken(), $code); - // Obtain the appToken assoicated + // Obtain the appToken associated try { $appToken = $this->tokenProvider->getTokenById($accessToken->getTokenId()); } catch (ExpiredTokenException $e) { diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 37bbdc9e1c4..9bf05f4484d 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -477,7 +477,7 @@ class UsersController extends AUserData { throw new OCSException($e->getHint(), 107); } catch (OCSException $e) { $this->logger->warning( - 'Failed addUser attempt with ocs exeption.', + 'Failed addUser attempt with ocs exception.', [ 'app' => 'ocs_api', 'exception' => $e, @@ -486,7 +486,7 @@ class UsersController extends AUserData { throw $e; } catch (InvalidArgumentException $e) { $this->logger->error( - 'Failed addUser attempt with invalid argument exeption.', + 'Failed addUser attempt with invalid argument exception.', [ 'app' => 'ocs_api', 'exception' => $e, diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue index bc086adc5cb..820a90fb1e3 100644 --- a/apps/settings/src/components/UserList/UserRow.vue +++ b/apps/settings/src/components/UserList/UserRow.vue @@ -445,7 +445,7 @@ export default { /** * Set user password * - * @param {string} password The email adress + * @param {string} password The email address */ updatePassword() { const password = this.$refs.password.value @@ -463,7 +463,7 @@ export default { /** * Set user mailAddress * - * @param {string} mailAddress The email adress + * @param {string} mailAddress The email address */ updateEmail() { const mailAddress = this.$refs.mailAddress.value diff --git a/apps/settings/src/store/apps.js b/apps/settings/src/store/apps.js index e6ddd76aaec..27a0faefe00 100644 --- a/apps/settings/src/store/apps.js +++ b/apps/settings/src/store/apps.js @@ -39,7 +39,7 @@ const state = { const mutations = { APPS_API_FAILURE(state, error) { - showError(t('settings', 'An error occured during the request. Unable to proceed.') + '<br>' + error.error.response.data.data.message, { isHTML: true }) + showError(t('settings', 'An error occurred during the request. Unable to proceed.') + '<br>' + error.error.response.data.data.message, { isHTML: true }) console.error(state, error) }, diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js index 792b9123129..c220e21e49f 100644 --- a/apps/settings/src/store/users.js +++ b/apps/settings/src/store/users.js @@ -197,7 +197,7 @@ const mutations = { break default: logger.error(`Unknown action type in updateUserCounts: '${actionType}'`) - // not throwing error to interupt execution as this is not fatal + // not throwing error to interrupt execution as this is not fatal } }, setUserData(state, { userid, key, value }) { diff --git a/apps/user_ldap/ajax/testConfiguration.php b/apps/user_ldap/ajax/testConfiguration.php index a5f41e93a92..9d89b641d66 100644 --- a/apps/user_ldap/ajax/testConfiguration.php +++ b/apps/user_ldap/ajax/testConfiguration.php @@ -47,7 +47,7 @@ try { if ($configurationOk) { //Configuration is okay /* - * Clossing the session since it won't be used from this point on. There might be a potential + * Closing the session since it won't be used from this point on. There might be a potential * race condition if a second request is made: either this request or the other might not * contact the LDAP backup server the first time when it should, but there shouldn't be any * problem with that other than the extra connection. diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js index 1a89eba3515..5e8b70f3162 100644 --- a/apps/user_ldap/js/wizard/view.js +++ b/apps/user_ldap/js/wizard/view.js @@ -40,7 +40,7 @@ OCA = OCA || {}; }, /** - * applies click events to the forward and backword buttons + * applies click events to the forward and backward buttons */ initControls: function() { var view = this; diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php index 29d60817c02..cec192721a5 100644 --- a/apps/user_ldap/lib/Access.php +++ b/apps/user_ldap/lib/Access.php @@ -1751,7 +1751,7 @@ class Access extends LDAPUtility { /** * converts a binary ObjectGUID into a string representation * - * @param string $oguid the ObjectGUID in it's binary form as retrieved from AD + * @param string $oguid the ObjectGUID in its binary form as retrieved from AD * @link https://www.php.net/manual/en/function.ldap-get-values-len.php#73198 */ private function convertObjectGUID2Str(string $oguid): string { @@ -1777,8 +1777,8 @@ class Access extends LDAPUtility { /** * the first three blocks of the string-converted GUID happen to be in * reverse order. In order to use it in a filter, this needs to be - * corrected. Furthermore the dashes need to be replaced and \\ preprended - * to every two hax figures. + * corrected. Furthermore the dashes need to be replaced and \\ prepended + * to every two hex figures. * * If an invalid string is passed, it will be returned without change. */ @@ -2003,7 +2003,7 @@ class Access extends LDAPUtility { $this->logger->debug('Ready for a paged search', ['app' => 'user_ldap']); } /* ++ Fixing RHDS searches with pages with zero results ++ - * We coudn't get paged searches working with our RHDS for login ($limit = 0), + * We couldn't get paged searches working with our RHDS for login ($limit = 0), * due to pages with zero results. * So we added "&& !empty($this->lastCookie)" to this test to ignore pagination * if we don't have a previous paged search. diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 5e3d3afc140..5072f9d3f74 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -245,7 +245,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I private function _groupMembers(string $dnGroup, ?array &$seen = null): array { if ($seen === null) { $seen = []; - // the root entry has to be marked as processed to avoind infinit loops, + // the root entry has to be marked as processed to avoid infinite loops, // but not included in the results laters on $excludeFromResult = $dnGroup; } diff --git a/apps/user_ldap/lib/PagedResults/IAdapter.php b/apps/user_ldap/lib/PagedResults/IAdapter.php index 31338126e40..62a0d0440c5 100644 --- a/apps/user_ldap/lib/PagedResults/IAdapter.php +++ b/apps/user_ldap/lib/PagedResults/IAdapter.php @@ -80,7 +80,7 @@ interface IAdapter { public function getResponseCallArgs(array $originalArgs): array; /** - * the adapter should do it's LDAP function call and return success state + * the adapter should do its LDAP function call and return success state * * @param resource|\LDAP\Connection $link LDAP resource * @return bool diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php index 655463a0ecd..b1915ab57b5 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -209,7 +209,7 @@ class Manager { } /** - * @brief returns a User object by it's Nextcloud username + * @brief returns a User object by its Nextcloud username * @param string $id the DN or username of the user * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null */ @@ -226,7 +226,7 @@ class Manager { } /** - * @brief returns a User object by it's DN or Nextcloud username + * @brief returns a User object by its DN or Nextcloud username * @param string $id the DN or username of the user * @return \OCA\User_LDAP\User\User|\OCA\User_LDAP\User\OfflineUser|null * @throws \Exception when connection could not be established diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php index e85e65a7d70..06b50448038 100644 --- a/apps/user_ldap/lib/Wizard.php +++ b/apps/user_ldap/lib/Wizard.php @@ -682,7 +682,7 @@ class Wizard extends LDAPUtility { 'Wiz: trying port '. $p . ', TLS '. $t, ['app' => 'user_ldap'] ); - //connectAndBind may throw Exception, it needs to be catched by the + //connectAndBind may throw Exception, it needs to be caught by the //callee of this method try { @@ -1077,7 +1077,7 @@ class Wizard extends LDAPUtility { } $this->logger->debug( - 'Wiz: Attemping to Bind', + 'Wiz: Attempting to Bind', ['app' => 'user_ldap'] ); //interesting part: do the bind! diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php index 6204c22cb9e..236dcee3bb7 100644 --- a/apps/user_ldap/tests/Group_LDAPTest.php +++ b/apps/user_ldap/tests/Group_LDAPTest.php @@ -154,7 +154,7 @@ class Group_LDAPTest extends TestCase { ->method('readAttribute') ->willReturnCallback(function ($name) { //the search operation will call readAttribute, thus we need - //to anaylze the "dn". All other times we just need to return + //to analyze the "dn". All other times we just need to return //something that is neither null or false, but once an array //with the users in the group – so we do so all other times for //simplicicity. @@ -724,7 +724,7 @@ class Group_LDAPTest extends TestCase { } /** - * tests that a user listing is complete, if all it's members have the group + * tests that a user listing is complete, if all its members have the group * as their primary. */ public function testUsersInGroupPrimaryMembersOnly() { @@ -770,7 +770,7 @@ class Group_LDAPTest extends TestCase { } /** - * tests that a user listing is complete, if all it's members have the group + * tests that a user listing is complete, if all its members have the group * as their primary. */ public function testUsersInGroupPrimaryAndUnixMembers() { @@ -814,7 +814,7 @@ class Group_LDAPTest extends TestCase { } /** - * tests that a user counting is complete, if all it's members have the group + * tests that a user counting is complete, if all its members have the group * as their primary. */ public function testCountUsersInGroupPrimaryMembersOnly() { diff --git a/apps/user_ldap/tests/Mapping/AbstractMappingTest.php b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php index 0d21172445f..8439bcc57c4 100644 --- a/apps/user_ldap/tests/Mapping/AbstractMappingTest.php +++ b/apps/user_ldap/tests/Mapping/AbstractMappingTest.php @@ -82,7 +82,7 @@ abstract class AbstractMappingTest extends \Test\TestCase { } /** - * initalizes environment for a test run and returns an array with + * initializes environment for a test run and returns an array with * test objects. Preparing environment means that all mappings are cleared * first and then filled with test entries. * @return array 0 = \OCA\User_LDAP\Mapping\AbstractMapping, 1 = array of diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index d2113de842e..470b0829868 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -493,7 +493,7 @@ class UserTest extends \Test\TestCase { $this->user->updateQuota(); } - //the testUpdateAvatar series also implicitely tests getAvatarImage + //the testUpdateAvatar series also implicitly tests getAvatarImage public function XtestUpdateAvatarJpegPhotoProvided() { $this->access->expects($this->once()) ->method('readAttribute') diff --git a/apps/user_status/lib/Service/PredefinedStatusService.php b/apps/user_status/lib/Service/PredefinedStatusService.php index 40f6052aa95..7d2f985c168 100644 --- a/apps/user_status/lib/Service/PredefinedStatusService.php +++ b/apps/user_status/lib/Service/PredefinedStatusService.php @@ -43,7 +43,7 @@ class PredefinedStatusService { private const VACATIONING = 'vacationing'; private const REMOTE_WORK = 'remote-work'; /** - * @depreacted See \OCP\UserStatus\IUserStatus::MESSAGE_CALL + * @deprecated See \OCP\UserStatus\IUserStatus::MESSAGE_CALL */ public const CALL = 'call'; diff --git a/apps/workflowengine/src/workflowengine.js b/apps/workflowengine/src/workflowengine.js index 0959ca86b25..e3f3fc2d9c3 100644 --- a/apps/workflowengine/src/workflowengine.js +++ b/apps/workflowengine/src/workflowengine.js @@ -42,7 +42,7 @@ import ShippedChecks from './components/Checks' */ /** - * A plugin for extending the admin page repesentation of a operator + * A plugin for extending the admin page representation of an operator * * @typedef {object} OperatorPlugin * @property {string} id - The PHP class name of the check |