[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[cdt-patch] patch to externalize a few strings in the ui and make.ui plugins.
|
This patch externalizes a couple of
remaining strings in the make.ui and ui plugins. There are still
a couple in the content assist code, but they are left as flags to remind
Doug to remove the test functionality :-).
-Dave
Index: src/org/eclipse/cdt/make/internal/ui/MakeResources.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeResources.properties,v
retrieving revision 1.36
diff -u -r1.36 MakeResources.properties
--- src/org/eclipse/cdt/make/internal/ui/MakeResources.properties 19 May 2005 01:34:11 -0000 1.36
+++ src/org/eclipse/cdt/make/internal/ui/MakeResources.properties 27 May 2005 14:22:55 -0000
@@ -81,6 +81,7 @@
SettingsBlock.makeWorkbench.incrementalBuildTarget=Incremental Build Target
SettingsBlock.makeWorkbench.fullBuildTarget=Full Build Target
SettingsBlock.makeWorkbench.cleanTarget=Clean Target
+SettingsBlock.variables=Variables...
TargetBlock.target.group_label=Target
TargetBlock.target.label=Target Name:
Index: src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java,v
retrieving revision 1.18
diff -u -r1.18 SettingsBlock.java
--- src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java 24 May 2005 14:15:42 -0000 1.18
+++ src/org/eclipse/cdt/make/ui/dialogs/SettingsBlock.java 27 May 2005 14:22:56 -0000
@@ -256,7 +256,8 @@
}
private Button addVariablesButton(Composite parent, final Text control) {
- Button variablesButton = createPushButton(parent, "Variables...", null);
+ String variablesTitle = MakeUIPlugin.getResourceString("SettingsBlock.variables"); //$NON-NLS-1$
+ Button variablesButton = createPushButton(parent, variablesTitle, null);
GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
variablesButton.setLayoutData(gd);
variablesButton.addSelectionListener(new SelectionAdapter() {Index: refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java,v
retrieving revision 1.25
diff -u -r1.25 RenameElementProcessor.java
--- refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java 16 May 2005 18:24:29 -0000 1.25
+++ refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java 27 May 2005 14:20:43 -0000
@@ -725,7 +725,7 @@
if(( returnType == null) || (returnType.length() == 0) )
return true;
- if(getCurrentElementName().startsWith("~"))
+ if(getCurrentElementName().startsWith("~")) //$NON-NLS-1$
return true;
return false;
Index: src/org/eclipse/cdt/internal/ui/CUIMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties,v
retrieving revision 1.18
diff -u -r1.18 CUIMessages.properties
--- src/org/eclipse/cdt/internal/ui/CUIMessages.properties 27 Apr 2005 19:18:11 -0000 1.18
+++ src/org/eclipse/cdt/internal/ui/CUIMessages.properties 27 May 2005 14:20:43 -0000
@@ -19,6 +19,7 @@
CEditor.contentassist.noCompletions=No completions available
CEditor.contentassist.parseError=No completions available due to parse error
CEditor.contentassist.timeout=Content Assist parsing has timed out
+CEditor.contentassist.badDialect=Unsupported Dialect Exception
CAnnotationHover.multipleMarkers=Multiple markers at this line
Index: src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties,v
retrieving revision 1.35
diff -u -r1.35 PreferencesMessages.properties
--- src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties 27 Apr 2005 19:18:11 -0000 1.35
+++ src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties 27 May 2005 14:20:44 -0000
@@ -213,6 +213,8 @@
#Code Formatting
CodeFormatterPreferencePage.title=Code Formatter
+CodeFormatterPreferencePage.selectionName=Formatters:
+CodeFormatterPreferencePage.emptyName=(NONE)
CodeFormatterPreferencePage.description=Code Formatter
# --- Linked Resources ---
Index: src/org/eclipse/cdt/internal/ui/search/DOMQuery.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/DOMQuery.java,v
retrieving revision 1.4
diff -u -r1.4 DOMQuery.java
--- src/org/eclipse/cdt/internal/ui/search/DOMQuery.java 16 May 2005 21:28:31 -0000 1.4
+++ src/org/eclipse/cdt/internal/ui/search/DOMQuery.java 27 May 2005 14:20:44 -0000
@@ -45,7 +45,6 @@
import org.eclipse.cdt.core.search.ICSearchScope;
import org.eclipse.cdt.core.search.IMatch;
import org.eclipse.cdt.core.search.OffsetLocatable;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTName;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
Index: src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java,v
retrieving revision 1.8
diff -u -r1.8 LevelTreeContentProvider.java
--- src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java 16 May 2005 18:24:29 -0000 1.8
+++ src/org/eclipse/cdt/internal/ui/search/LevelTreeContentProvider.java 27 May 2005 14:20:44 -0000
@@ -20,7 +20,6 @@
import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement;
import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.core.parser.IOffsetDuple;
import org.eclipse.cdt.core.search.BasicSearchMatch;
import org.eclipse.cdt.core.search.ILineLocatable;
import org.eclipse.cdt.core.search.IMatchLocatable;
Index: src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java,v
retrieving revision 1.18
diff -u -r1.18 CCompletionProcessor2.java
--- src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java 16 May 2005 14:43:56 -0000 1.18
+++ src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java 27 May 2005 14:20:44 -0000
@@ -46,6 +46,7 @@
private String assistPrefix = "CEditor.contentassist"; //$NON-NLS-1$
private String noCompletions = assistPrefix + ".noCompletions"; //$NON-NLS-1$
private String parseError = assistPrefix + ".parseError"; //$NON-NLS-1$
+ private String dialectError = assistPrefix + ".badDialect"; //$NON-NLS-1$
public CCompletionProcessor2(IEditorPart editor) {
this.editor = editor;
@@ -134,7 +135,7 @@
return propsArray;
} catch (UnsupportedDialectException e) {
- errorMessage = "Unsupported Dialect Exception";
+ errorMessage = CUIMessages.getString(dialectError);
} catch (Throwable e) {
errorMessage = e.toString();
}
Index: src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java,v
retrieving revision 1.3
diff -u -r1.3 CodeFormatterBlock.java
--- src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java 12 May 2005 14:34:45 -0000 1.3
+++ src/org/eclipse/cdt/ui/dialogs/CodeFormatterBlock.java 27 May 2005 14:20:45 -0000
@@ -18,6 +18,7 @@
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.CCorePreferenceConstants;
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
+import org.eclipse.cdt.internal.ui.preferences.PreferencesMessages;
import org.eclipse.cdt.internal.ui.util.PixelConverter;
import org.eclipse.cdt.utils.ui.controls.ControlFactory;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -48,7 +49,7 @@
private static final String ATTR_ID="id"; //$NON-NLS-1$
// This is a hack until we have a default Formatter.
// For now it is comment out in the plugin.xml
- private static final String NONE="(NONE)"; //$NON-NLS-1$
+ private static final String NONE=PreferencesMessages.getString("CodeFormatterPreferencePage.emptyName"); //$NON-NLS-1$
public CodeFormatterBlock(Preferences prefs) {
@@ -105,7 +106,7 @@
ControlFactory.createEmptySpace(control, 2);
- Label label = ControlFactory.createLabel(control, "Formatters:");
+ Label label = ControlFactory.createLabel(control, PreferencesMessages.getString("CodeFormatterPreferencePage.selectionName")); //$NON-NLS-1$
label.setLayoutData(new GridData());
fFormatterCombo = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY);
GridData gd = new GridData(GridData.GRAB_HORIZONTAL);
