From 21d7160337c60531a000fbf55f997d2f0b906219 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 25 Oct 2018 13:13:49 +0200 Subject: [PATCH] rename 'Compilation' to 'Build' --- .../src/com/intellij/testFramework/CompilerTester.java | 2 +- .../notification/impl/actions/NotificationTestAction.java | 2 +- resources-en/src/messages/CompilerBundle.properties | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java index 8fe80ca0bbea..263b0d6e2135 100644 --- a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java +++ b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java @@ -323,7 +323,7 @@ public class CompilerTester { } private static boolean isSpamMessage(String text) { - return text.contains("Compilation completed successfully") || + return text.contains(CompilerBundle.message("status.compilation.completed.successfully")) || text.contains("used to compile") || text.contains("illegal reflective") || text.contains("Picked up") || diff --git a/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java b/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java index a7e6a4480ad2..76ea6268f9c6 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/actions/NotificationTestAction.java @@ -89,7 +89,7 @@ public class NotificationTestAction extends AnAction implements DumbAware { Action toolwindow = new AbstractAction("Toolwindow Examples") { @Override public void actionPerformed(ActionEvent e) { - setExamples("// Example\nToolwindow\nContent:Compilation completed successfully in 7 s 851 ms\n--\n" + + setExamples("// Example\nToolwindow\nContent:Build completed successfully in 7 s 851 ms\n--\n" + "// Description: Notifications shows for toolwindow TODO\n" + "Toolwindow\nType:info/error/warn\nIcon:\nTitle:\n" + "Content:\nContent:\n--\n"); diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties index fec3275d4f29..995627d68890 100644 --- a/resources-en/src/messages/CompilerBundle.properties +++ b/resources-en/src/messages/CompilerBundle.properties @@ -56,9 +56,9 @@ compiler.error.failed.to.delete=Failed to delete {0} progress.updating.caches=Updating caches... compiler.content.name.compile=Rebuild compiler.content.name.make=Build -status.compilation.completed.successfully.with.warnings=Compilation completed successfully with {0} {0,choice, 0#warnings|1#warning|2#warnings} -status.compilation.completed.successfully=Compilation completed successfully -status.compilation.completed.successfully.with.warnings.and.errors=Compilation completed with {0} {0,choice, 0#errors|1#error|2#errors} and {1} {1,choice, 0#warnings|1#warning|2#warnings} +status.compilation.completed.successfully.with.warnings=Build completed successfully with {0} {0,choice, 0#warnings|1#warning|2#warnings} +status.compilation.completed.successfully=Build completed successfully +status.compilation.completed.successfully.with.warnings.and.errors=Build completed with {0} {0,choice, 0#errors|1#error|2#errors} and {1} {1,choice, 0#warnings|1#warning|2#warnings} progress.executing.precompile.tasks=Executing pre-compile tasks... progress.executing.postcompile.tasks=Executing post-compile tasks... error.failed.to.create.directory=Failed to create directory {0}