From 33f931d5277e0d72f5c9082d176a1a574f033e87 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 8 Nov 2009 22:12:12 -0500
Subject: [PATCH] add default language to site admin panel

---
 actions/siteadminpanel.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index f66aa855c0..2da26e4bd6 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -90,7 +90,8 @@ class SiteadminpanelAction extends AdminPanelAction
 
     function saveSettings()
     {
-        static $settings = array('name', 'broughtby', 'broughtbyurl', 'email', 'timezone');
+        static $settings = array('name', 'broughtby', 'broughtbyurl',
+                                 'email', 'timezone', 'language');
 
         $values = array();
 
@@ -143,6 +144,12 @@ class SiteadminpanelAction extends AdminPanelAction
             $this->clientError(_('Timezone not selected.'));
             return;
         }
+
+        // Validate language
+
+        if (!is_null($language) && !in_array($language, array_keys(get_nice_language_list()))) {
+            $this->clientError(sprintf(_('Unknown language "%s"'), $language));
+        }
     }
 }
 
@@ -209,6 +216,10 @@ class SiteAdminPanelForm extends Form
         $this->out->dropdown('timezone', _('Default timezone'),
                              $timezones, _('Default timezone for the site; usually UTC.'),
                              true, $this->value('timezone'));
+
+        $this->out->dropdown('language', _('Language'),
+                             get_nice_language_list(), _('Default site language'),
+                             false, $this->value('language'));
     }
 
     /**