Commit 734f815a9325ad472517cd5ef869d6081eb89661
System locale on Mac may not return AnyCountry for any language != C
Because of QLocale limitations this broke other places.
Reviewed-by: Denis Dzyubenko
| | |
| 1216 | 1216 | QString preferredLanguage; |
| 1217 | 1217 | QString preferredCountry; |
| 1218 | 1218 | getMacPreferredLanguageAndCountry(&preferredLanguage, &preferredCountry); |
| QLocale::Language languageCode = (preferredLanguage.isEmpty() ? QLocale::C : codeToLanguage(preferredLanguage.data())); |
| QLocale::Country countryCode = (preferredCountry.isEmpty() ? QLocale::AnyCountry : codeToCountry(preferredCountry.data())); |
| const QLocalePrivate *d = findLocale(languageCode, countryCode); |
| 1219 | 1222 | if (type == LanguageId) |
| return codeToLanguage(preferredLanguage.data()); |
| return codeToCountry(preferredCountry.data()); |
| return (QLocale::Language)d->languageId(); |
| return (QLocale::Country)d->countryId(); |
| 1222 | 1225 | } |
| 1223 | 1226 | |
| 1224 | 1227 | case MeasurementSystem: |
