From 0881eba80eabfea65919be2f3d65235ccd0b5eb6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 3 Mar 2010 12:08:07 -0800
Subject: Language setting fixes: - switch 'en_US' to 'en', fixes the "admin
 panel switches to Arabic" bug - tweak setting descriptions to clarify that
 most of the time we'll be using browser language - add a backend switch to
 disable language detection (should this be exposed to ui?)

---
 lib/default.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/default.php')

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,
-- 
cgit v1.2.3-54-g00ecf