diff options
| author | Zach Copley <zach@status.net> | 2010-03-03 12:11:20 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-03-03 12:11:20 -0800 |
| commit | 09169d6f3ce60770d0ae115bde38a9274e794640 (patch) | |
| tree | 5c680b74ceacacb9dc2c6e3183f150fa45468052 /lib/default.php | |
| parent | 82ea0f7884d291f11964d5a54dbf8194ce24cb58 (diff) | |
| parent | 0881eba80eabfea65919be2f3d65235ccd0b5eb6 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Language setting fixes:
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index 7b50242ae..b7216045c 100644 --- a/lib/default.php +++ b/lib/default.php @@ -40,7 +40,8 @@ $default = 'logdebug' => false, 'fancy' => false, 'locale_path' => INSTALLDIR.'/locale', - 'language' => 'en_US', + 'language' => 'en', + 'langdetect' => true, 'languages' => get_all_languages(), 'email' => array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null, |