From 750d92e51654494e395b280bd587ae496c40d9bd Mon Sep 17 00:00:00 2001 From: fedor Date: Wed, 27 Jun 2001 03:13:33 +0000 Subject: [PATCH] Check for language in locale on MingW git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10264 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSUserDefaults.m | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index bfcf6d339..19a9a20fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-06-26 Adam Fedor + + * Source/NSUserDefaults.m (+userLanguages): On MingW systems, check + locale for language name. + 2001-06-26 Richard Frith-Macdonald * Source/NSSerializer.m: While deserializing, check strings to see diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m index 98e7e6034..bc8afea03 100644 --- a/Source/NSUserDefaults.m +++ b/Source/NSUserDefaults.m @@ -358,6 +358,15 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */ { currLang = [NSArray arrayWithObject: GSLanguageFromLocale(locale)]; } +#ifdef __MINGW__ + if (currLang == nil && locale != 0) + { + /* Check for language as the first part of the locale string */ + NSRange under = [locale rangeOfString: @"_"]; + if (under.location) + currLang = [locale substringToIndex: under.location]; + } +#endif if (currLang == nil) { const char *env_list;