From: David Cho-Lerat Date: Fri, 19 Jan 2024 14:51:38 +0000 (+0100) Subject: SONAR-20997 Replace "cancelled" with "canceled" X-Git-Tag: 10.4.0.87286~133 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fc955fbbc69646853e93567142c986104c4c4b32;p=sonarqube.git SONAR-20997 Replace "cancelled" with "canceled" --- diff --git a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java index c69008df1af..e4dbd2709ec 100644 --- a/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java +++ b/server/sonar-db-dao/src/it/java/org/sonar/db/ce/CeActivityDaoIT.java @@ -421,7 +421,7 @@ public class CeActivityDaoIT { assertThat(underTest.selectByUuid(db.getSession(), "TASK_2").get().getIsLast()).isTrue(); assertThat(underTest.selectByUuid(db.getSession(), "TASK_3").get().getIsLast()).isTrue(); - // inserting a cancelled task does not change the last task + // inserting a canceled task does not change the last task insert("TASK_4", REPORT, ENTITY_1, CANCELED); assertThat(underTest.selectByUuid(db.getSession(), "TASK_1").get().getIsLast()).isFalse(); assertThat(underTest.selectByUuid(db.getSession(), "TASK_2").get().getIsLast()).isTrue(); diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 77d54132341..895041987a7 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -5147,7 +5147,7 @@ indexation.progression_with_error={0} out of {1} projects reindexed with some {l indexation.progression_with_error.link=tasks failing indexation.completed=All project data has been reloaded. indexation.completed_with_error=SonarQube completed the reload of project data. Some {link} causing some projects to remain unavailable. -indexation.completed_with_error.link=tasks failed or cancelled +indexation.completed_with_error.link=tasks failed or canceled indexation.admin_link=See {link} for more information. indexation.page_unavailable.title.issues=Issues page is temporarily unavailable indexation.page_unavailable.title.portfolios=Portfolios page is temporarily unavailable