From e0d76fba65d46a8299bb00aa677308521f7cfc03 Mon Sep 17 00:00:00 2001 From: smizrahi Date: Thu, 27 Jul 2023 14:15:20 +0200 Subject: [PATCH] fix(login): Fix language list sorting on login page --- UI/MainUI/SOGoRootPage.m | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index d9569dbbf..a19446a46 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -659,9 +659,19 @@ static const NSString *kJwtKey = @"jwt"; return [self labelForKey: [self language]]; } +NSComparisonResult languageSort(id el1, id el2, void *context) +{ + NSString *t1, *t2; + + t1 = [context labelForKey: el1]; + t2 = [context labelForKey: el2]; + + return [t1 compare: t2 options: NSCaseInsensitiveSearch]; +} + - (NSArray *) languages { - return [[SOGoSystemDefaults sharedSystemDefaults] supportedLanguages]; + return [[[SOGoSystemDefaults sharedSystemDefaults] supportedLanguages] sortedArrayUsingFunction: languageSort context: self]; } - (NSString *) languageText