[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [cdt-patch] fix for 70221
|
okay here it is...
Thanks,
Tanya
"Alain Magloire"
<alain@xxxxxxx>
Sent by: cdt-patch-admin@xxxxxxxxxxx
16/07/2004 12:29 PM
|
Please respond to
cdt-patch |
|
|
To
| cdt-patch@xxxxxxxxxxx
|
|
cc
|
|
|
Subject
| Re: [cdt-patch] fix for 70221 |
|
>
> Here's a patch to externalize "matches" in the Search Results
view.
hmm ... dinglis was playing in this area, you might want to resync and
repost.
Sorry about that.
_______________________________________________
cdt-patch mailing list
cdt-patch@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/cdt-patch
Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.523
diff -u -r1.523 ChangeLog
--- ChangeLog 16 Jul 2004 18:05:25 -0000 1.523
+++ ChangeLog 16 Jul 2004 19:39:27 -0000
@@ -1,3 +1,9 @@
+2004-07-16 Tanya Wolff
+
+ Fix for 70221: unexternalized strings
+ * org.eclipse.cdt.internal.ui/search/CountLabelProvider.java
+ * org.eclipse.cdt.internal.ui/search/CSearchMessages.properties
+
2004-07-16 Vladimir Hirsl
Implementation of HP-UX SOM binary parser page.
Index: src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties,v
retrieving revision 1.19
diff -u -r1.19 CSearchMessages.properties
--- src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties 24 Jun 2004 19:29:33 -0000 1.19
+++ src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties 16 Jul 2004 19:39:27 -0000
@@ -17,8 +17,9 @@
Search.Error.search.title=Search Error
Search.Error.search.message=An error occurred during the search operation
-CSearchResultCollector.match= 1 match
-CSearchResultCollector.matches= {0} matches
+# Examples of the display for the following value are
+# "(1 match)", where {0} is 1 and "(5 matches)", where {0} is 2 or more.
+CSearchResultCollector.matches= ({0} {0, choice, 1\#match|2\#matches})
CSearchResultCollector.done= Search done: {0}.
CSearchResultCollector.searching= Searching...
Index: src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java,v
retrieving revision 1.2
diff -u -r1.2 CountLabelProvider.java
--- src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java 24 Jun 2004 19:29:33 -0000 1.2
+++ src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java 16 Jul 2004 19:39:27 -0000
@@ -46,13 +46,13 @@
}
public String getText(Object element) {
- int matchCount= fPage.getInput().getMatchCount(element);
+ int c = fPage.getInput().getMatchCount(element);
+
String text= fLabelProvider.getText(element);
- if (matchCount == 0)
+ if (c == 0)
return text;
- if (matchCount == 1)
- return fLabelProvider.getText(element)+ " (" + 1 + " match)"; //$NON-NLS-1$ //$NON-NLS-2$
- return text + " (" + matchCount + " matches)"; //$NON-NLS-1$ //$NON-NLS-2$
+ Integer matchCount= new Integer(c);
+ return fLabelProvider.getText(element) + " "+ CSearchMessages.getFormattedString("CSearchResultCollector.matches", matchCount); //$NON-NLS-1$ //$NON-NLS-2$
}
public void dispose() {
