Skip to content

fix(i18n): locale-sensitive ordering of folders (#10718) #10848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wmontwe merged 1 commit into from
Apr 13, 2026
+7 −1
Merged

fix(i18n): locale-sensitive ordering of folders (#10718) #10848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion legacy/ui/folder/src/main/java/app/k9mail/legacy/ui/folder/DefaultDisplayFolderRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import app.k9mail.legacy.mailstore.FolderTypeMapper
import app.k9mail.legacy.mailstore.MessageStoreManager
import app.k9mail.legacy.message.controller.MessagingControllerRegistry
import app.k9mail.legacy.message.controller.SimpleMessagingListener
import java.text.Collator
import kotlin.coroutines.CoroutineContext
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel
Expand Down Expand Up @@ -34,7 +35,12 @@ class DefaultDisplayFolderRepository(
.thenByDescending { it.folder.type == FolderType.OUTBOX }
.thenByDescending { it.folder.type != FolderType.REGULAR }
.thenByDescending { it.isInTopGroup }
.thenBy(String.CASE_INSENSITIVE_ORDER) { it.folder.name }
.thenBy(
// #10718 use locale-sensitive ordering for folders
Collator.getInstance().apply {
decomposition = Collator.CANONICAL_DECOMPOSITION
},
) { it.folder.name }

private fun getDisplayFolders(
account: LegacyAccountDto,
Expand Down
Loading