Skip to content

Commit 04e139d

Browse files
authored
Merge pull request quarkusio#53662 from SAY-5/fix-occured-typos
Fix 'occured' -> 'occurred' across DevUI i18n and qute template timeout
2 parents 068ccac + 3475bcc commit 04e139d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

extensions/devui/resources/src/main/resources/dev-ui/i18n/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ export const templates = {
241241
'workspace-discard': 'Discard',
242242
'workspace-unsaved-dialog': 'There are unsaved changes. Do you want to discard or save them?',
243243
'workspace-check-logs': 'Please check your logs.',
244-
'workspace-error': 'An error occured.',
244+
'workspace-error': 'An error occurred.',
245245
'workspace-saved-success': 'saved successfully',
246246
'workspace-not-saved': 'NOT saved',
247247
'workspace-no-content': 'has no content',

extensions/devui/resources/src/main/resources/dev-ui/qwc/qwc-workspace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ export class QwcWorkspace extends observeState(QwcHotReloadElement) {
527527
if(err.error.message){
528528
notifier.showErrorMessage(err.message + ". " + msg('Please check your logs.', { id: 'workspace-check-logs' }));
529529
}else {
530-
notifier.showErrorMessage(msg('An error occured.', { id: 'workspace-error' }) + " " + msg('Please check your logs.', { id: 'workspace-check-logs' }));
530+
notifier.showErrorMessage(msg('An error occurred.', { id: 'workspace-error' }) + " " + msg('Please check your logs.', { id: 'workspace-check-logs' }));
531531
}
532532
});
533533
}

independent-projects/qute/core/src/main/java/io/quarkus/qute/TemplateImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public CompletionStage<Void> consume(Consumer<String> resultConsumer) {
241241
}
242242

243243
private TemplateException newTimeoutException(long timeout) {
244-
return new TemplateException(TemplateImpl.this.toString() + " rendering timeout [" + timeout + "ms] occured");
244+
return new TemplateException(TemplateImpl.this.toString() + " rendering timeout [" + timeout + "ms] occurred");
245245
}
246246

247247
@Override

independent-projects/qute/core/src/test/java/io/quarkus/qute/TimeoutTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public void testTimeout() {
1919
// Invalid timeout is ignored
2020
.setAttribute("timeout", "bar")
2121
.render())
22-
.withMessage("Template 1 [generatedId=1] rendering timeout [100ms] occured");
22+
.withMessage("Template 1 [generatedId=1] rendering timeout [100ms] occurred");
2323

2424
assertThatExceptionOfType(TemplateException.class)
2525
.isThrownBy(
2626
() -> engine.parse("{foo}").data("foo", new CompletableFuture<>()).createUni().await().indefinitely())
27-
.withMessage("Template 2 [generatedId=2] rendering timeout [100ms] occured");
27+
.withMessage("Template 2 [generatedId=2] rendering timeout [100ms] occurred");
2828

2929
assertThatExceptionOfType(ExecutionException.class)
3030
.isThrownBy(
@@ -44,7 +44,7 @@ public void testTimeoutAttribute() {
4444
assertThatExceptionOfType(TemplateException.class)
4545
.isThrownBy(() -> engine.parse("{foo}").data("foo", new CompletableFuture<>()).setAttribute("timeout", 300)
4646
.render())
47-
.withMessage("Template 1 [generatedId=1] rendering timeout [300ms] occured");
47+
.withMessage("Template 1 [generatedId=1] rendering timeout [300ms] occurred");
4848
}
4949

5050
@Test
@@ -54,7 +54,7 @@ public void testUniNoItemOrFailure() {
5454
Uni<String> fooUni = Uni.createFrom().completionStage(new CompletableFuture<>());
5555
assertThatExceptionOfType(TemplateException.class)
5656
.isThrownBy(() -> template.data("foo", fooUni).render())
57-
.withMessage("Template 1 [generatedId=1] rendering timeout [100ms] occured");
57+
.withMessage("Template 1 [generatedId=1] rendering timeout [100ms] occurred");
5858
}
5959

6060
}

0 commit comments

Comments
 (0)