Merge branch 'support-4.1' of https://github.com/Evolveum/midpoint in…

…to support-4.1
Evolveum · Aug 11, 2020 · 400b94a · 400b94a
2 parents 6f0cc0f + 7cfc83a
commit 400b94a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -180,6 +180,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
+import java.text.Collator;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Predicate;
@@ -816,7 +817,10 @@ public static List<ObjectTypes> createObjectTypesList() {
             String localizedType1 = translate(decs1);
             String localizedType2 = translate(desc2);
 
-            return String.CASE_INSENSITIVE_ORDER.compare(localizedType1, localizedType2);
+            Collator collator = Collator.getInstance(getCurrentLocale());
+            collator.setStrength(Collator.PRIMARY);
+
+            return collator.compare(localizedType1, localizedType2);
         }).collect(Collectors.toList());
     }