From 572680a1ea4708962213c4e8aeb8fb4ba0d38843 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Thu, 19 Dec 2019 13:04:58 +0200 Subject: [PATCH] Fixed previous i18n work from 47269fe0 gilab #330 Change-Id: I8e31cbb9e123699558c3da386d49f48a5b55c6f1 --- .../ui/actions/AssignSymbolGroupsDialog.java | 14 +++++--------- .../modeling/ui/actions/WorkbenchMessages.java | 4 ++-- .../modeling/ui/actions/messages.properties | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/AssignSymbolGroupsDialog.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/AssignSymbolGroupsDialog.java index b768a05ab..a85c35628 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/AssignSymbolGroupsDialog.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/AssignSymbolGroupsDialog.java @@ -38,10 +38,6 @@ public abstract class AssignSymbolGroupsDialog extends SelectionDialog { private static final String DIALOG = "AssignSymbolGroupsDialog"; //$NON-NLS-1$ - static String SELECT_ALL_TITLE = ""; //$NON-NLS-1$ - - static String DESELECT_ALL_TITLE = ""; //$NON-NLS-1$ - // the root element to populate the viewer with protected Object inputElement; @@ -86,7 +82,7 @@ public abstract class AssignSymbolGroupsDialog extends SelectionDialog { if (message != null) { setMessage(message); } else { - setMessage(""); //$NON-NLS-1$ + setMessage(WorkbenchMessages.ListSelection_message); } IDialogSettings settings = Activator.getDefault().getDialogSettings(); @@ -114,7 +110,7 @@ public abstract class AssignSymbolGroupsDialog extends SelectionDialog { buttonComposite.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, true)); Button selectButton = createButton(buttonComposite, - IDialogConstants.SELECT_ALL_ID, SELECT_ALL_TITLE, false); + IDialogConstants.SELECT_ALL_ID, WorkbenchMessages.SelectionDialog_selectLabel, false); SelectionListener listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -125,7 +121,7 @@ public abstract class AssignSymbolGroupsDialog extends SelectionDialog { selectButton.addSelectionListener(listener); Button deselectButton = createButton(buttonComposite, - IDialogConstants.DESELECT_ALL_ID, DESELECT_ALL_TITLE, false); + IDialogConstants.DESELECT_ALL_ID, WorkbenchMessages.SelectionDialog_deselectLabel, false); listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -139,7 +135,7 @@ public abstract class AssignSymbolGroupsDialog extends SelectionDialog { Label label = new Label(buttonComposite, SWT.NONE); Button newButton = createButton(buttonComposite, - IDialogConstants.INTERNAL_ID-1, org.simantics.modeling.ui.actions.WorkbenchMessages.AssignSymbolGroupsDialog_NewDots, false); + IDialogConstants.INTERNAL_ID-1, org.simantics.modeling.ui.actions.WorkbenchMessages.AssignSymbolGroupsDialog_New, false); listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { @@ -149,7 +145,7 @@ public abstract class AssignSymbolGroupsDialog extends SelectionDialog { newButton.addSelectionListener(listener); Button removeButton = createButton(buttonComposite, - IDialogConstants.INTERNAL_ID-2, org.simantics.modeling.ui.actions.WorkbenchMessages.AssignSymbolGroupsDialog_RemoveAnd, false); + IDialogConstants.INTERNAL_ID-2, org.simantics.modeling.ui.actions.WorkbenchMessages.AssignSymbolGroupsDialog_Remove, false); listener = new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/WorkbenchMessages.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/WorkbenchMessages.java index 36ed5b8fb..24e7b8af4 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/WorkbenchMessages.java +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/WorkbenchMessages.java @@ -4,8 +4,8 @@ import org.eclipse.osgi.util.NLS; public class WorkbenchMessages extends NLS { private static final String BUNDLE_NAME = "org.simantics.modeling.ui.actions.messages"; //$NON-NLS-1$ - public static String AssignSymbolGroupsDialog_NewDots; - public static String AssignSymbolGroupsDialog_RemoveAnd; + public static String AssignSymbolGroupsDialog_New; + public static String AssignSymbolGroupsDialog_Remove; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, WorkbenchMessages.class); diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/messages.properties b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/messages.properties index 57f9e15cb..0020e272b 100644 --- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/messages.properties +++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/actions/messages.properties @@ -10,8 +10,8 @@ AssignSymbolGroup_SelectSymbolGroupsTheSelectedSymbolIsShownIn=Select symbol gro AssignSymbolGroup_SelectSymbolGroupsTheSelectedSymbolsAreShownIn=Select symbol groups the selected {0} symbols are shown in. AssignSymbolGroup_SymbolGroupAssignments=Symbol Group Assignments AssignSymbolGroup_WriteSymbolGroupName=Write the name of the new symbol group. -AssignSymbolGroupsDialog_NewDots=&New... -AssignSymbolGroupsDialog_RemoveAnd=&Remove +AssignSymbolGroupsDialog_New=&New... +AssignSymbolGroupsDialog_Remove=&Remove CompilePGraphsAction_CompilePGraphs=Compile PGraphs CompilePGraphsAction_Continue=Continue CompilePGraphsAction_FollowingIssuesFound=The following issues were found: -- 2.47.1