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

avoid hard-coding product name

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-06 20:51:14 +02:00
parent 96605d5f23
commit c2e29bc7dc
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java
+8 -3
View File
@@ -22,6 +22,7 @@ import com.intellij.conversion.impl.ConversionContextImpl;
import com.intellij.conversion.impl.ConversionRunner;
import com.intellij.conversion.impl.ProjectConversionUtil;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
@@ -65,8 +66,10 @@ public class ConvertProjectDialog extends DialogWrapper {
myBackupDir = ProjectConversionUtil.getBackupDir(context.getProjectBaseDir());
myTextPane.setSize(new Dimension(350, Integer.MAX_VALUE));
final String message =
IdeBundle.message("label.text.project.has.older.format", context.getProjectFile().getName(), myBackupDir.getAbsolutePath());
final String message = IdeBundle.message("label.text.project.has.older.format",
context.getProjectFile().getName(),
ApplicationNamesInfo.getInstance().getProductName(),
myBackupDir.getAbsolutePath());
Messages.configureMessagePaneUi(myTextPane, message, false);
myTextPane.addHyperlinkListener(new HyperlinkListener() {
@@ -145,7 +148,9 @@ public class ConvertProjectDialog extends DialogWrapper {
private boolean checkReadOnlyFiles() throws IOException {
List<File> files = getReadOnlyFiles();
if (!files.isEmpty()) {
final String message = IdeBundle.message("message.text.unlock.read.only.files", getFilesString(files));
final String message = IdeBundle.message("message.text.unlock.read.only.files",
ApplicationNamesInfo.getInstance().getProductName(),
getFilesString(files));
final String[] options = {CommonBundle.getContinueButtonText(), CommonBundle.getCancelButtonText()};
if (Messages.showOkCancelDialog(myMainPanel, message, IdeBundle.message("dialog.title.convert.project"), options[0], options[1], null) != 0) {
return false;
platform/platform-resources-en/src/messages/IdeBundle.properties
+4 -4
View File
@@ -234,12 +234,12 @@ error.project.file.is.corrupted=Project file is corrupted
title.cannot.convert.project=Cannot Convert Project
dialog.title.convert.project=Convert Project
label.text.project.has.older.format=<html><body>The project ''{0}'' has an older format and will be converted. You won''t be able to open the project by earlier versions of IDEA. <a href="details">Details</a><br/>\
Old versions of project files will be saved to: ''{1}''</body></html>
message.text.unlock.read.only.files=<html><body>The following files are read only. IDEA will unlock them.<br>{0}</body></html>
label.text.project.has.older.format=<html><body>The project ''{0}'' has an older format and will be converted. You may not be able to open the project with earlier versions of {1}. <a href="details">Details</a><br/>\
Old versions of project files will be saved to: ''{2}''</body></html>
message.text.unlock.read.only.files=<html><body>The following files are read only. {0} will unlock them.<br>{1}</body></html>
error.message.cannot.make.files.writable=Cannot make the following files writable:\n{0}
error.cannot.convert.project=Cannot convert project: {0}
message.files.doesn.t.exists.0.so.the.corresponding.modules.won.t.be.converted.do.you.want.to.continue=<html><body>The following files doesn''t exists: <br>\
message.files.doesn.t.exists.0.so.the.corresponding.modules.won.t.be.converted.do.you.want.to.continue=<html><body>The following files don''t exists: <br>\
{0}The corresponding modules won''t be converted. Do you want to continue?</body></html>
select.in.project.settings=Project Structure