Skip to content

Commit ddeccba

Browse files
authored
Merge pull request #1155 from oxygen-dioxide/localizedsort
Fix OpenUtau failed to search singers when the user runs OpenUtau for the first time
2 parents e2b36cf + a9153d7 commit ddeccba

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

OpenUtau.Core/Util/LocalizedSort.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@ public int Compare(string x, string y) {
1919
public static class LocalizedSort {
2020
public static IEnumerable<T> LocalizedOrderBy<T>(this IEnumerable<T> source, Func<T, string> selector) {
2121
var sortingOrder = Preferences.Default.SortingOrder;
22-
if(sortingOrder == String.Empty) {
23-
sortingOrder = Preferences.Default.Language;
22+
CultureInfo culture;
23+
if(sortingOrder == null) {
24+
//Follow the display language
25+
culture = CultureInfo.GetCultureInfo(Preferences.Default.Language);
26+
} else if(sortingOrder == String.Empty){
27+
//Don't translate
28+
culture = CultureInfo.InvariantCulture;
29+
} else {
30+
culture = CultureInfo.GetCultureInfo(sortingOrder);
2431
}
25-
var comparer = new LocalizedComparer(CultureInfo.GetCultureInfo(sortingOrder));
32+
var comparer = new LocalizedComparer(culture);
2633
return source.OrderBy(selector, comparer);
2734
}
2835
}

0 commit comments

Comments
 (0)