MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

correct message when updating EAP to release build (IDEA-86233)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-06-29 20:13:09 +02:00
parent 868ee82842
commit e99d98f501
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java
+2 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,9 +31,7 @@ import com.intellij.notification.NotificationListener;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.ApplicationInfoEx;
import com.intellij.openapi.diagnostic.ErrorReportSubmitter;
import com.intellij.openapi.diagnostic.IdeaLoggingEvent;
import com.intellij.openapi.diagnostic.SubmittedReportInfo;
@@ -203,9 +201,8 @@ public class ITNReporter extends ErrorReportSubmitter {
msg = DiagnosticBundle.message("error.report.sending.failure");
}
if (e instanceof UpdateAvailableException) {
ApplicationInfoEx appInfo = (ApplicationInfoEx) ApplicationManager.getApplication().getComponent(ApplicationInfo.class);
String message = DiagnosticBundle.message(
appInfo.isEAP() ? "error.report.new.eap.build.message" : "error.report.new.build.message", e.getMessage());
"error.report.new.eap.build.message", e.getMessage());
showMessageDialog(parentComponent, project, message, CommonBundle.getWarningTitle(), Messages.getWarningIcon());
callback.consume(new SubmittedReportInfo(null, "0", SubmittedReportInfo.SubmissionStatus.FAILED));
}
platform/platform-resources-en/src/messages/DiagnosticBundle.properties
+1 -2
View File
@@ -25,8 +25,7 @@ error.report.authentication.failed=JetBrains Account authentication failed. Do y
error.report.posting.failed=Report posting failed: {0}. Do you want to try again?
error.report.exception.title=Error Report
error.report.failure.message=Error report sending failed.
error.report.new.eap.build.message=New EAP build {0} is available.
error.report.new.build.message=Product update {0} is available.
error.report.new.eap.build.message=New build {0} is available.
error.report.sending.failure=Sending failed. Do you want to try again?
error.list.message.info={0}. Occurred {1,choice,1#once|2#{1} times} since the last clear.
error.list.message.unread=Unread.