summaryrefslogtreecommitdiff
path: root/lib/default.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-03 15:31:44 -0500
committerSarven Capadisli <csarven@status.net>2010-03-03 15:31:44 -0500
commit13713a09bbb2cac0c82c2d6602c8820662740218 (patch)
tree07402e6428664dea5b8c0b255e3b50eab0d63d13 /lib/default.php
parentd3c1888256e32495cb0db9065ff7a03e105299a3 (diff)
parentc7d390e4949b28c28c95375bfe4523de05af7808 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/default.php')
-rw-r--r--lib/default.php3
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,