[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Applied Re: [cdt-patch] cdt-ui patch
|
Thanks Tanya.
Hoda Amer
Staff Software Engineer
Rational Software - IBM Software Group
Tanya Wolff/Ottawa/IBM@IBMCA
Sent by: cdt-patch-admin@xxxxxxxxxxx
03/16/2004 02:01 PM
|
Please respond to
cdt-patch |
|
|
To
| cdt-patch@xxxxxxxxxxx
|
|
cc
|
|
|
Subject
| [cdt-patch] cdt-ui patch |
|
Here are the remaining strings in cdt ui plugin which are non-translatable,
and a couple error messages which are.
Thanks,
Tanya
Index: ChangeLog
===================================================================
retrieving revision 1.311
diff -u -r1.311 ChangeLog
--- ChangeLog 15 Mar 2004 21:17:47 -0000 1.311
+++ ChangeLog 16 Mar 2004 18:47:19 -0000
@@ -1,3 +1,6 @@
+2004-03-16 Tanya Wolff
+ Externalized strings and marked non-translatable ones.
+
2004-03-15 Hoda Amer
Fix for [Bug 54323] Refactor: Menu item from outline view
Index: browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java
===================================================================
retrieving revision 1.3
diff -u -r1.3 AllTypesCache.java
--- browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java 8 Mar 2004 19:52:34 -0000 1.3
+++ browser/org/eclipse/cdt/ui/browser/typeinfo/AllTypesCache.java 16 Mar 2004 18:47:19 -0000
@@ -202,30 +202,30 @@
for (int i= 0; i < types.length; ++i) {
switch (types[i]) {
case ICElement.C_NAMESPACE:
- pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.NAMESPACE, ICSearchConstants.DECLARATIONS, false));
+ pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.NAMESPACE, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$
break;
case ICElement.C_CLASS: // fall through
case ICElement.C_TEMPLATE_CLASS:
- pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.CLASS, ICSearchConstants.DECLARATIONS, false));
+ pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.CLASS, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$
break;
case ICElement.C_STRUCT: // fall through
case ICElement.C_TEMPLATE_STRUCT:
- pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.STRUCT, ICSearchConstants.DECLARATIONS, false));
+ pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.STRUCT, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$
break;
case ICElement.C_UNION: // fall through
case ICElement.C_TEMPLATE_UNION:
- pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.UNION, ICSearchConstants.DECLARATIONS, false));
+ pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.UNION, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$
break;
case ICElement.C_ENUMERATION:
- pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.ENUM, ICSearchConstants.DECLARATIONS, false));
+ pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.ENUM, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$
break;
case ICElement.C_TYPEDEF:
- pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.TYPEDEF, ICSearchConstants.DECLARATIONS, false));
+ pattern.addPattern(SearchEngine.createSearchPattern("*", ICSearchConstants.TYPEDEF, ICSearchConstants.DECLARATIONS, false)); //$NON-NLS-1$
break;
default:
Index: browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 TypeSelectionDialog.java
--- browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java 8 Mar 2004 18:22:31 -0000 1.1
+++ browser/org/eclipse/cdt/ui/browser/typeinfo/TypeSelectionDialog.java 16 Mar 2004 18:47:19 -0000
@@ -31,7 +31,7 @@
private static final char END_SYMBOL= '<';
private static final char ANY_STRING= '*';
- private final static String scopeResolutionOperator= "::";
+ private final static String scopeResolutionOperator= "::"; //$NON-NLS-1$
private StringMatcher fMatcher;
private StringMatcher fQualifierMatcher;
Index: refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 RenameRefactoring.java
--- refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java 9 Mar 2004 19:50:00 -0000 1.1
+++ refactor/org/eclipse/cdt/internal/corext/refactoring/RenameRefactoring.java 16 Mar 2004 18:47:23 -0000
@@ -151,6 +151,6 @@
if (isAvailable())
return getName();
else
- return "No refactoring available to process: " + fElement;
+ return "No refactoring available to process: " + fElement; //$NON-NLS-1$
}
}
Index: refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java
===================================================================
retrieving revision 1.2
diff -u -r1.2 RenameElementProcessor.java
--- refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java 15 Mar 2004 21:17:47 -0000 1.2
+++ refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java 16 Mar 2004 18:47:23 -0000
@@ -58,7 +58,7 @@
private ICElement fCElement = null;
private SearchResultGroup[] fReferences;
private TextChangeManager fChangeManager;
- private final String QUALIFIER = "::";
+ private final String QUALIFIER = "::"; //$NON-NLS-1$
private boolean fUpdateReferences;
@@ -117,7 +117,7 @@
*/
public String getCurrentElementName() {
if(fCElement == null)
- return "";
+ return ""; //$NON-NLS-1$
String name = fCElement.getElementName();
if (name.indexOf(QUALIFIER) != -1){
return (name.substring(name.lastIndexOf(QUALIFIER) + 2, name.length()));
@@ -148,7 +148,7 @@
public RefactoringStatus checkNewElementName(String newName){
if ((fCElement == null) || (!(fCElement instanceof ISourceReference)) || (fCElement instanceof ITranslationUnit)) {
- return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element"));
+ return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$
}
Assert.isNotNull(newName, "new name"); //$NON-NLS-1$
@@ -209,7 +209,7 @@
public RefactoringStatus checkActivation() throws CoreException {
RefactoringStatus result= null;
if ((fCElement == null) || (!(fCElement instanceof ISourceReference)) || (fCElement instanceof ITranslationUnit)) {
- return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element"));
+ return RefactoringStatus.createFatalErrorStatus(RefactoringCoreMessages.getString("RenameTypeRefactoring.wrong_element")); //$NON-NLS-1$
}
return Checks.checkIfTuBroken(fCElement);
@@ -346,7 +346,7 @@
if(structure.getElementType() == ICElement.C_CLASS){
orPattern.addPattern(SearchEngine.createSearchPattern( searchPrefix,
ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false ));
- orPattern.addPattern(SearchEngine.createSearchPattern( "~"+ searchPrefix,
+ orPattern.addPattern(SearchEngine.createSearchPattern( "~"+ searchPrefix, //$NON-NLS-1$
ICSearchConstants.METHOD, ICSearchConstants.ALL_OCCURRENCES, false ));
}
}
Index: refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 UserInterfaceStarter.java
--- refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java 9 Mar 2004 19:50:00 -0000 1.1
+++ refactor/org/eclipse/cdt/internal/ui/refactoring/UserInterfaceStarter.java 16 Mar 2004 18:47:25 -0000
@@ -70,7 +70,7 @@
{
MessageDialog.openInformation(parent,
refactoring.getName(),
- "No user interface found");
+ RefactoringMessages.getString("UserInterfaceStarter.No_ui_found")); //$NON-NLS-1$
}
}
Index: refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties
===================================================================
retrieving revision 1.3
diff -u -r1.3 refactoringui.properties
--- refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties 15 Mar 2004 21:17:47 -0000 1.3
+++ refactor/org/eclipse/cdt/internal/ui/refactoring/refactoringui.properties 16 Mar 2004 18:47:25 -0000
@@ -581,3 +581,5 @@
ChangeTypeWizard.grayed_types= Type ''{0}'' cannot be used as a replacement for type ''{1}''
ChangeTypeWizard.with_itself= Cannot replace type ''{0}'' with itself
ChangeTypeInputPage.Select_Type=Press "Compute" to determine allowable supertypes
+
+UserInterfaceStarter.No_ui_found=No user interface found
\ No newline at end of file
Index: src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 MouseClickListener.java
--- src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java 8 Mar 2004 15:30:13 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/editor/MouseClickListener.java 16 Mar 2004 18:47:28 -0000
@@ -137,7 +137,7 @@
try {
text.redrawRange(offset, length, true);
} catch (IllegalArgumentException x) {
- org.eclipse.cdt.internal.core.model.Util.log(x, "Error in CEditor.MouseClickListener.repairRepresentation", ICLogConstants.CDT);
+ org.eclipse.cdt.internal.core.model.Util.log(x, "Error in CEditor.MouseClickListener.repairRepresentation", ICLogConstants.CDT); //$NON-NLS-1$
}
}
@@ -408,9 +408,9 @@
else{
String selWord = null;
String slas = document.get(start,1);
- if (slas.equals("\n") ||
- slas.equals("\t") ||
- slas.equals(" "))
+ if (slas.equals("\n") || //$NON-NLS-1$
+ slas.equals("\t") || //$NON-NLS-1$
+ slas.equals(" ")) //$NON-NLS-1$
{
selWord =document.get(start+1, end - start - 1);
@@ -429,7 +429,7 @@
charX == '>')
return null;
- if (selWord.equals("#include"))
+ if (selWord.equals("#include")) //$NON-NLS-1$
{
//get start of next identifier
Index: src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
===================================================================
retrieving revision 1.24
diff -u -r1.24 CEditorPreferencePage.java
--- src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java 5 Mar 2004 00:45:14 -0000 1.24
+++ src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java 16 Mar 2004 18:47:29 -0000
@@ -925,7 +925,7 @@
item.setControl(createContentAssistPage(folder));
item = new TabItem(folder, SWT.NONE);
- item.setText("Navigation");
+ item.setText(PreferencesMessages.getString("CEditorPreferencePage.Navigation")); //$NON-NLS-1$
item.setImage(CPluginImages.get(CPluginImages.IMG_OBJS_TUNIT));
item.setControl(createNavPage(folder));
@@ -945,7 +945,7 @@
navComposite.setLayout(layout);
Button navCheck = new Button(navComposite,SWT.CHECK);
- navCheck.setText("Enable Hyperlink Navigation");
+ navCheck.setText(PreferencesMessages.getString("CEditorPreferencePage.Enable_Hyperlink_Navigation")); //$NON-NLS-1$
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
navCheck.setLayoutData(gd);
Index: src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
===================================================================
retrieving revision 1.6
diff -u -r1.6 PreferencesMessages.properties
--- src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties 26 Feb 2004 19:30:35 -0000 1.6
+++ src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties 16 Mar 2004 18:47:29 -0000
@@ -112,3 +112,5 @@
CEditorPreferencePage.textFont.changeButton=C&hange...
TemplatePreferencePage.Viewer.preview=Preview:
BuildConsolePreferencePage.fieldEditors.buildConsoleLines=&Build console lines:
+CEditorPreferencePage.Navigation=Navigation
+CEditorPreferencePage.Enable_Hyperlink_Navigation=Enable Hyperlink Navigation
Index: src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java
===================================================================
retrieving revision 1.1
diff -u -r1.1 OpenDeclarationsAction.java
--- src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java 5 Mar 2004 00:45:14 -0000 1.1
+++ src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java 16 Mar 2004 18:47:30 -0000
@@ -279,7 +279,7 @@
progressMonitor.run(true, true, runnable);
if (elementsFound.isEmpty() == true) {
- MessageDialog.openInformation(getShell(),CSearchMessages.getString("CSearchOperation.operationUnavailable.title"), CSearchMessages.getString("CSearchOperation.operationUnavailable.message")); //$NON-NLS-1$
+ MessageDialog.openInformation(getShell(),CSearchMessages.getString("CSearchOperation.operationUnavailable.title"), CSearchMessages.getString("CSearchOperation.operationUnavailable.message")); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
Index: src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 ContentAssistPreference.java
--- src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java 9 Mar 2004 19:16:25 -0000 1.5
+++ src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java 16 Mar 2004 18:47:31 -0000
@@ -152,7 +152,7 @@
boolean useDotAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_DOT);
boolean useArrowAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_ARROW);
boolean useDoubleColonAsTrigger = store.getBoolean(AUTOACTIVATION_TRIGGERS_DOUBLECOLON);
- String triggers = "";
+ String triggers = ""; //$NON-NLS-1$
if (useDotAsTrigger){
triggers += "."; //$NON-NLS-1$
}
