diff options
| author | Pierre-Charles David | 2015-09-02 09:51:21 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2015-09-02 13:09:01 +0000 |
| commit | 2c29631c24c99f452e757d02aee45b8b47e2342a (patch) | |
| tree | 0d6fa88d02b5862e877bd611498a54bae1e7641c | |
| parent | 26176d4ed0073c9fc55e633aa829a16c819e964d (diff) | |
| download | org.eclipse.sirius-2c29631c24c99f452e757d02aee45b8b47e2342a.tar.gz org.eclipse.sirius-2c29631c24c99f452e757d02aee45b8b47e2342a.tar.xz org.eclipse.sirius-2c29631c24c99f452e757d02aee45b8b47e2342a.zip | |
[472057] Fix externalization error in SWTUtil
Bug: 472057
Change-Id: I4dae4866374215b785f9a88acf2866e9f8d589f5
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.common.ui/plugin.properties | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/org.eclipse.sirius.common.ui/plugin.properties b/plugins/org.eclipse.sirius.common.ui/plugin.properties index c1d8bef6d5..410885b01a 100644 --- a/plugins/org.eclipse.sirius.common.ui/plugin.properties +++ b/plugins/org.eclipse.sirius.common.ui/plugin.properties @@ -40,7 +40,7 @@ RenameDialog_askNewName_caseInsensitive = Enter new name (case insensitive): RenameDialog_askNewName_caseSensitive = Enter new name (case sensitive): RenameDialog_errorNameClash = New name must be different RenameDialog_title = Rename representation -SWTUtil_askToSaveChanges = {0} have been modified{1}. Save changes{2}? +SWTUtil_askToSaveChanges = {0} have been modified. Save changes? SWTUtil_askToSaveChanges_openElseWhere = {0} have been modified, but are still open elsewhere with identical changes. Closing this will not lose those changes. Save changes now anyway? SWTUtil_saveDialog_title = Save SelectFilesWizardPage_notEnoughFiles = Not enough files were selected. diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java index 6ca27cae6d..d8c1a56fbc 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 THALES GLOBAL SERVICES. + * Copyright (c) 2007, 2015 THALES GLOBAL SERVICES. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.sirius.common.ui.tools.api.util; +import java.text.MessageFormat; import java.util.Map; import org.eclipse.jface.dialogs.IDialogConstants; @@ -498,9 +499,9 @@ public final class SWTUtil { // preference if several editors are opened final String message; if (stillOpenElsewhere) { - message = Messages.SWTUtil_askToSaveChanges; + message = MessageFormat.format(Messages.SWTUtil_askToSaveChanges, label); } else { - message = Messages.SWTUtil_askToSaveChanges_openElseWhere; + message = MessageFormat.format(Messages.SWTUtil_askToSaveChanges_openElseWhere, label); } dialog = new SiriusMessageDialogWithToggle(window.getShell(), Messages.SWTUtil_saveDialog_title, null, message, MessageDialog.QUESTION, buttons, 0, WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false, stillOpenElsewhere) { |