Fix localized_comparator for macOS (#40100)

CleverRaven · May 3, 2020 · 964fe80 · 964fe80
1 parent fd7db4a
commit 964fe80
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/translations.cpp b/src/translations.cpp
@@ -698,5 +698,12 @@ std::string operator+( const translation &lhs, const translation &rhs )
 
 bool localized_comparator::operator()( const std::string &l, const std::string &r ) const
 {
+#if defined(MACOSX)
+    CFStringRef lr = CFStringCreateWithCStringNoCopy( kCFAllocatorDefault, l.c_str(),
+                     kCFStringEncodingUTF8, kCFAllocatorNull );
+    CFStringRef rr = CFStringCreateWithCStringNoCopy( kCFAllocatorDefault, r.c_str(),
+                     kCFStringEncodingUTF8, kCFAllocatorNull );
+    return CFStringCompare( lr, rr, kCFCompareLocalized ) < 0;
+#endif
     return std::locale()( l, r );
 }