From 6aa232bd237e22ecaa4dbdbba15980fa87416397 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Wed, 1 Jul 2020 14:35:17 -0400 Subject: [PATCH] lldb: Replace a concatenated string with NLS.bind To make it more translation-friendly. Change-Id: Icc1a94b2db2f90b060f90e16d56aadf57573b2c6 Signed-off-by: Marc-Andre Laperle --- .../dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java | 3 ++- .../cdt/llvm/dsf/lldb/core/internal/launching/Messages.java | 2 +- .../llvm/dsf/lldb/core/internal/launching/messages.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java index 021d446c025..d88117a5f8c 100644 --- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java +++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.ISourceLocator; +import org.eclipse.osgi.util.NLS; /** * A specific LLDB launch delegate that allows customization such as setting the @@ -52,7 +53,7 @@ public class LLDBLaunchDelegate extends GdbLaunchDelegate { if (path == null) { path = LLDBLaunch.getLLDBPath(config); } - return path.toString().trim() + " (" + Messages.LLDBLaunchDelegate_mimicking_gdb + " gdb " + gdbVersion + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return NLS.bind(Messages.LLDBLaunchDelegate_cli_label, path.toString().trim(), gdbVersion); } @Override diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/Messages.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/Messages.java index af30fab8fc9..e76bcfe157f 100644 --- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/Messages.java +++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/Messages.java @@ -20,7 +20,7 @@ import org.eclipse.osgi.util.NLS; public class Messages extends NLS { private static final String BUNDLE_NAME = "org.eclipse.cdt.llvm.dsf.lldb.core.internal.launching.messages"; //$NON-NLS-1$ public static String LLDBLaunch_minimum_version_error; - public static String LLDBLaunchDelegate_mimicking_gdb; + public static String LLDBLaunchDelegate_cli_label; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/messages.properties b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/messages.properties index 9ad5ca5bb61..1bd9515ec87 100644 --- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/messages.properties +++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/messages.properties @@ -10,4 +10,4 @@ ############################################################################### LLDBLaunch_minimum_version_error=The lldb debugger does not meet the minimum version requirement. Current: {0}, required: {1} {2}. -LLDBLaunchDelegate_mimicking_gdb=mimicking +LLDBLaunchDelegate_cli_label={0} (mimicking gdb {1})