dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10851) -Feature [OSX]: OpenTTD will now pick the same language as finder is set to if no config file is found (ln-)

Browse Source
This commit is contained in:
bjarni
2007-08-11 15:52:34 +00:00
parent 76ab8ab86c
commit 8c5d47d510
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/os/macosx/macos.mm
View File

@@ -158,3 +158,16 @@ void ShowMacErrorDialog(const char *error)
ShowMacDialog(error, buffer, "Quit"); ShowMacDialog(error, buffer, "Quit");
abort(); abort();
} }
/** Determine the current user's locale. */
const char *GetCurrentLocale(const char *)
{
static char retbuf[32] = { '\0' };
NSUserDefaults* defs = [NSUserDefaults standardUserDefaults];
NSArray* languages = [defs objectForKey:@"AppleLanguages"];
NSString* preferredLang = [languages objectAtIndex:0];
/* preferredLang is either 2 or 5 characters long ("xx" or "xx_YY"). */
strncpy(retbuf, [preferredLang cString], 31);
return retbuf;
}

5
src/strings.cpp
View File

@@ -1237,7 +1237,8 @@ bool ReadLanguagePack(int lang_index)
} }
/* Win32 implementation in win32.cpp. */ /* Win32 implementation in win32.cpp. */
#ifndef WIN32 /* OS X implementation in os/macosx/macos.mm. */
#if !(defined(WIN32) || defined(__APPLE__))
/** Determine the current charset based on the environment /** Determine the current charset based on the environment
* First check some default values, after this one we passed ourselves * First check some default values, after this one we passed ourselves
* and if none exist return the value for $LANG * and if none exist return the value for $LANG
@@ -1261,7 +1262,7 @@ const char *GetCurrentLocale(const char *param)
return getenv("LANG"); return getenv("LANG");
} }
#endif /* ifndef WIN32 */ #endif /* !(defined(WIN32) || defined(__APPLE__)) */
static int CDECL LanguageCompareFunc(const void *a, const void *b) static int CDECL LanguageCompareFunc(const void *a, const void *b)
{ {