fix(preferences): Fix language list sorting on preferences page

Alinto · Aug 4, 2023 · f5f74f7 · f5f74f7
1 parent 528d178
commit f5f74f7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -78,6 +78,8 @@ static const NSString *kDisableSharingCalendar = @"Calendar";
 - (NSString *) pageTitle;
 - (NSString *) helpURL;
 
+NSComparisonResult languageSort(id el1, id el2, void *context);
+
 - (NSArray *) supportedLanguages;
 - (NSString *) loginSuffix;
 

diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -467,6 +467,16 @@ - (NSString *) helpURL
   return [self stringForKey: @"SOGoHelpURL"];
 }
 
+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 *) supportedLanguages
 {
   static NSArray *supportedLanguages = nil;

diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
@@ -659,15 +659,6 @@ - (NSString *) localizedLanguage
   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
 {

diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
@@ -1129,12 +1129,13 @@ - (BOOL) shouldDisplayPasswordChange
            userCanChangePassword];
 }
 
+
 //
 // Used by wox template
 //
 - (NSArray *) languages
 {
-  return [[SOGoSystemDefaults sharedSystemDefaults] supportedLanguages];
+  return [[[SOGoSystemDefaults sharedSystemDefaults] supportedLanguages] sortedArrayUsingFunction: languageSort context: self];
 }
 
 //