From f31b86179ef9fb956adde8aacf5a1ee4b1ea7c77 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 17 Jul 2017 13:03:58 +0300
Subject: [PATCH] diff: unify error messages

---
 .../src/com/intellij/diff/requests/ErrorDiffRequest.java       | 3 ++-
 .../src/com/intellij/diff/impl/DiffRequestProcessor.java       | 3 ++-
 .../platform-resources-en/src/messages/DiffBundle.properties   | 1 +
 .../openapi/vcs/changes/ChangeViewDiffRequestProcessor.java    | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/platform/diff-api/src/com/intellij/diff/requests/ErrorDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/ErrorDiffRequest.java
index 8e3f8eab3e66..ae4000d79b94 100644
--- a/platform/diff-api/src/com/intellij/diff/requests/ErrorDiffRequest.java
+++ b/platform/diff-api/src/com/intellij/diff/requests/ErrorDiffRequest.java
@@ -16,6 +16,7 @@
 package com.intellij.diff.requests;
 
 import com.intellij.diff.chains.DiffRequestProducer;
+import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -70,6 +71,6 @@ public class ErrorDiffRequest extends MessageDiffRequest {
   @NotNull
   private static String getErrorMessage(@NotNull Throwable e) {
     String message = e.getMessage();
-    return StringUtil.isEmptyOrSpaces(message) ? "Error: can't show diff" : message;
+    return StringUtil.isEmptyOrSpaces(message) ? DiffBundle.message("error.cant.show.diff.message") : message;
   }
 }
diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
index 5f2fed95f63c..3a4719cd38f4 100644
--- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
@@ -43,6 +43,7 @@ import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.project.DumbAware;
@@ -297,7 +298,7 @@ public abstract class DiffRequestProcessor implements Disposable {
     }
     catch (Throwable e) {
       LOG.error(e);
-      myState = new ErrorState(new ErrorDiffRequest("Error: can't show diff"), getFittedTool());
+      myState = new ErrorState(new ErrorDiffRequest(DiffBundle.message("error.cant.show.diff.message")), getFittedTool());
       myState.init();
     }
 
diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties
index f3114678cbe9..3fb0d989df70 100644
--- a/platform/platform-resources-en/src/messages/DiffBundle.properties
+++ b/platform/platform-resources-en/src/messages/DiffBundle.properties
@@ -45,6 +45,7 @@ diff.count.differences.status.text={0, choice, 0#No differences|1#1 difference|2
 diff.all.differences.ignored.text=Differences ignored
 diff.highlighting.disabled.text=Differences highlighting is off
 cant.launch.diff.tool.error.message=Can't Launch Diff Tool
+error.cant.show.diff.message=Error: can't show diff
 binary.files.are.identical.message=Binary files are identical
 files.are.identical.dialog.title=Files Are Identical
 binary.files.are.different.message=Binary files are different
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java
index 944b2e99c23e..d52a3e8645cc 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java
@@ -21,6 +21,7 @@ import com.intellij.diff.requests.DiffRequest;
 import com.intellij.diff.requests.ErrorDiffRequest;
 import com.intellij.diff.requests.LoadingDiffRequest;
 import com.intellij.diff.util.DiffUserDataKeysEx.ScrollToPolicy;
+import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
@@ -86,7 +87,7 @@ public abstract class ChangeViewDiffRequestProcessor extends CacheDiffRequestPro
   protected DiffRequest loadRequest(@NotNull ChangeWrapper provider, @NotNull ProgressIndicator indicator)
     throws ProcessCanceledException, DiffRequestProducerException {
     ChangeDiffRequestProducer presentable = ChangeDiffRequestProducer.create(getProject(), provider.change);
-    if (presentable == null) return new ErrorDiffRequest("Can't show diff");
+    if (presentable == null) return new ErrorDiffRequest(DiffBundle.message("error.cant.show.diff.message"));
     return presentable.process(getContext(), indicator);
   }