From 758d5f457add317e915a0c539f9e30096ec07fcd Mon Sep 17 00:00:00 2001
From: Peter Kraume <peter.kraume@gmx.de>
Date: Fri, 19 Aug 2022 19:00:13 +0200
Subject: [PATCH] =?UTF-8?q?[BUGFIX]=C2=A0Fix=20typo=20in=20clipboard=20and?=
=?UTF-8?q?=20SettingsController?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Resolves: #98183
Releases: main, 11.5
Change-Id: Ib4d123e86a9b158b86e20322fc53ca94ff5b9be7
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75525
Tested-by: core-ci <typo3@b13.com>
Tested-by: Torben Hansen <derhansen@gmail.com>
Tested-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Thomas Löffler <loeffler@spooner-web.de>
Reviewed-by: Torben Hansen <derhansen@gmail.com>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
---
Build/Sources/TypeScript/backend/clipboard-panel.ts | 4 ++--
.../backend/Resources/Public/JavaScript/clipboard-panel.js | 4 ++--
.../sysext/install/Classes/Controller/SettingsController.php | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Build/Sources/TypeScript/backend/clipboard-panel.ts b/Build/Sources/TypeScript/backend/clipboard-panel.ts
index 22fc9eb5776a..95bae335ad36 100644
--- a/Build/Sources/TypeScript/backend/clipboard-panel.ts
+++ b/Build/Sources/TypeScript/backend/clipboard-panel.ts
@@ -115,7 +115,7 @@ export class ClipboardPanel extends LitElement {
}
})
.catch((): TemplateResult => {
- Notification.error('An error occured while fetching clipboard data');
+ Notification.error('An error occurred while fetching clipboard data');
return html``;
});
}
@@ -220,7 +220,7 @@ export class ClipboardPanel extends LitElement {
}
})
.catch((): void => {
- Notification.error('An error occured while updating clipboard data');
+ Notification.error('An error occurred while updating clipboard data');
});
}
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/clipboard-panel.js b/typo3/sysext/backend/Resources/Public/JavaScript/clipboard-panel.js
index 84ddacdcf0e5..c618fb307746 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/clipboard-panel.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/clipboard-panel.js
@@ -29,7 +29,7 @@ var ClipboardPanel_1,CopyMode,__decorate=function(t,e,i,a){var o,n=arguments.len
</tbody>
</tabel>
</div>
- `}return Notification.error("Clipboard data could not be fetched"),html``}).catch(()=>(Notification.error("An error occured while fetching clipboard data"),html``))}renderTab(t,e){return html`
+ `}return Notification.error("Clipboard data could not be fetched"),html``}).catch(()=>(Notification.error("An error occurred while fetching clipboard data"),html``))}renderTab(t,e){return html`
<tr>
<td colspan="2" class="nowrap">
<button type="button" class="btn btn-link p-0" title="${t.description}" data-action="setP" @click="${e=>this.updateClipboard(e,{CB:{setP:t.identifier}})}">
@@ -97,4 +97,4 @@ var ClipboardPanel_1,CopyMode,__decorate=function(t,e,i,a){var o,n=arguments.len
`:html``}
</div>
</td>
- </tr>`}updateClipboard(t,e){t.preventDefault();const i=t.currentTarget;new AjaxRequest(top.TYPO3.settings.Clipboard.moduleUrl).post(e).then(async t=>{const a=await t.resolve();!0===a.success?(i.dataset.action&&i.dispatchEvent(new CustomEvent("typo3:clipboard:"+i.dataset.action,{detail:{payload:e,response:a},bubbles:!0,cancelable:!1})),this.reloadModule()):Notification.error("Clipboard data could not be updated")}).catch(()=>{Notification.error("An error occured while updating clipboard data")})}reloadModule(){this.returnUrl?this.ownerDocument.location.href=this.returnUrl:this.ownerDocument.location.reload()}};__decorate([property({type:String,attribute:"return-url"})],ClipboardPanel.prototype,"returnUrl",void 0),__decorate([property({type:String})],ClipboardPanel.prototype,"table",void 0),ClipboardPanel=ClipboardPanel_1=__decorate([customElement("typo3-backend-clipboard-panel")],ClipboardPanel);export{ClipboardPanel};
\ No newline at end of file
+ </tr>`}updateClipboard(t,e){t.preventDefault();const i=t.currentTarget;new AjaxRequest(top.TYPO3.settings.Clipboard.moduleUrl).post(e).then(async t=>{const a=await t.resolve();!0===a.success?(i.dataset.action&&i.dispatchEvent(new CustomEvent("typo3:clipboard:"+i.dataset.action,{detail:{payload:e,response:a},bubbles:!0,cancelable:!1})),this.reloadModule()):Notification.error("Clipboard data could not be updated")}).catch(()=>{Notification.error("An error occurred while updating clipboard data")})}reloadModule(){this.returnUrl?this.ownerDocument.location.href=this.returnUrl:this.ownerDocument.location.reload()}};__decorate([property({type:String,attribute:"return-url"})],ClipboardPanel.prototype,"returnUrl",void 0),__decorate([property({type:String})],ClipboardPanel.prototype,"table",void 0),ClipboardPanel=ClipboardPanel_1=__decorate([customElement("typo3-backend-clipboard-panel")],ClipboardPanel);export{ClipboardPanel};
\ No newline at end of file
diff --git a/typo3/sysext/install/Classes/Controller/SettingsController.php b/typo3/sysext/install/Classes/Controller/SettingsController.php
index 14de3e2a7b2d..3aa271e6e929 100644
--- a/typo3/sysext/install/Classes/Controller/SettingsController.php
+++ b/typo3/sysext/install/Classes/Controller/SettingsController.php
@@ -543,7 +543,7 @@ class SettingsController extends AbstractController
$message = "Successfully updated the following feature toggles:\n" . implode(",\n", $updatedFeatures);
$severity = ContextualFeedbackSeverity::OK;
} else {
- $message = 'An error occured while saving. Some settings may not have been updated.';
+ $message = 'An error occurred while saving. Some settings may not have been updated.';
$severity = ContextualFeedbackSeverity::ERROR;
}
} else {
--
GitLab