### Eclipse Workspace Patch 1.0
#P sakai_2-6-x
Index: announcement/announcement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementAction.java
===================================================================
--- announcement/announcement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementAction.java	(revision 62884)
+++ announcement/announcement-tool/tool/src/java/org/sakaiproject/announcement/tool/AnnouncementAction.java	(working copy)
@@ -33,6 +33,7 @@
 import java.util.Properties;
 import java.util.Stack;
 import java.util.Vector;
+import java.text.Collator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -3656,7 +3657,7 @@
 			if (m_criteria.equals(SORT_SUBJECT))
 			{
 				// sorted by the discussion message subject
-				result = ((AnnouncementMessage) o1).getAnnouncementHeader().getSubject().compareToIgnoreCase(
+				result = Collator.getInstance().compare(((AnnouncementMessage) o1).getAnnouncementHeader().getSubject(),
 						((AnnouncementMessage) o2).getAnnouncementHeader().getSubject());
 			}
 			else if (m_criteria.equals(SORT_DATE))
@@ -3763,13 +3764,13 @@
 			else if (m_criteria.equals(SORT_FROM))
 			{
 				// sorted by the discussion message subject
-				result = ((AnnouncementMessage) o1).getAnnouncementHeader().getFrom().getSortName().compareToIgnoreCase(
+				result = Collator.getInstance().compare(((AnnouncementMessage) o1).getAnnouncementHeader().getFrom().getSortName(),
 						((AnnouncementMessage) o2).getAnnouncementHeader().getFrom().getSortName());
 			}
 			else if (m_criteria.equals(SORT_CHANNEL))
 			{
 				// sorted by the channel name.
-				result = ((AnnouncementWrapper) o1).getChannelDisplayName().compareToIgnoreCase(
+				result = Collator.getInstance().compare(((AnnouncementWrapper) o1).getChannelDisplayName(),
 						((AnnouncementWrapper) o2).getChannelDisplayName());
 			}
 			else if (m_criteria.equals(SORT_PUBLIC))
@@ -3779,21 +3780,21 @@
 				if (factor1 == null) factor1 = "false";
 				String factor2 = ((AnnouncementMessage) o2).getProperties().getProperty(ResourceProperties.PROP_PUBVIEW);
 				if (factor2 == null) factor2 = "false";
-				result = factor1.compareToIgnoreCase(factor2);
+				result = Collator.getInstance().compare(factor1,factor2);
 			}
 			else if (m_criteria.equals(SORT_FOR))
 			{
 				// sorted by the public view attribute
 				String factor1 = ((AnnouncementWrapper) o1).getRange();
 				String factor2 = ((AnnouncementWrapper) o2).getRange();
-				result = factor1.compareToIgnoreCase(factor2);
+				result = Collator.getInstance().compare(factor1,factor2);
 			}
 			else if (m_criteria.equals(SORT_GROUPTITLE))
 			{
 				// sorted by the group title
 				String factor1 = ((Group) o1).getTitle();
 				String factor2 = ((Group) o2).getTitle();
-				result = factor1.compareToIgnoreCase(factor2);
+				result = Collator.getInstance().compare(factor1,factor2);
 			}
 			else if (m_criteria.equals(SORT_GROUPDESCRIPTION))
 			{
@@ -3808,7 +3809,7 @@
 				{
 					factor2 = "";
 				}
-				result = factor1.compareToIgnoreCase(factor2);
+				result = Collator.getInstance().compare(factor1,factor2);
 			}
 
 			// sort ascending or descending