From 7cfc83a51a2daef3e3d7624af4b38e5285f2eea2 Mon Sep 17 00:00:00 2001 From: lskublik Date: Mon, 27 Jul 2020 10:35:03 +0200 Subject: [PATCH] fix for sorting objectTypes with a respect to national alphabets (MID-6369) --- .../evolveum/midpoint/gui/api/util/WebComponentUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 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 index f6f87625c8f..b1d7f3ee0ef 100644 --- 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 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()); }