File tree Expand file tree Collapse file tree 2 files changed +10
-7
lines changed
Expand file tree Collapse file tree 2 files changed +10
-7
lines changed Original file line number Diff line number Diff line change 1212 @autoreleasepool {
1313 @try {
1414 NSString * decSeparator = (NSString *) [[NSLocale currentLocale ] objectForKey: NSLocaleDecimalSeparator ];
15- std::wstring ds = NE::StringToWString ([decSeparator cStringUsingEncoding: NSUTF8StringEncoding]).c_str ();
16- result.SetDecimalSeparator (ds.c_str ()[0 ]);
17-
18- NSString * listSeparator = (NSString *) [[NSLocale currentLocale ] objectForKey: NSLocaleGroupingSeparator ];
19- std::wstring ls = NE::StringToWString ([listSeparator cStringUsingEncoding: NSUTF8StringEncoding]).c_str ();
20- result.SetListSeparator (ls.c_str ()[0 ]);
15+ std::wstring decimalSeparatorStr = NE::StringToWString ([decSeparator cStringUsingEncoding: NSUTF8StringEncoding]);
16+ wchar_t decimalSeparatorChar = decimalSeparatorStr[0 ];
17+ result.SetDecimalSeparator (decimalSeparatorChar);
18+
19+ wchar_t listSeparatorChar = L' ,' ;
20+ if (listSeparatorChar == decimalSeparatorChar) {
21+ listSeparatorChar = L' ;' ;
22+ }
23+ result.SetListSeparator (listSeparatorChar);
2124 } @catch (NSException *) {
2225
2326 }
Original file line number Diff line number Diff line change 252252 }
253253 return fontCache.at (key);
254254 } @catch (NSException *) {
255- return nil ;
255+
256256 }
257257 }
258258 return nil ;
You can’t perform that action at this time.
0 commit comments