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 /actions | |
| 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 'actions')
| -rw-r--r-- | actions/siteadminpanel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index 8c8f8b374..4b29819b7 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -277,8 +277,8 @@ class SiteAdminPanelForm extends AdminForm $this->unli(); $this->li(); - $this->out->dropdown('language', _('Language'), - get_nice_language_list(), _('Default site language'), + $this->out->dropdown('language', _('Default language'), + get_nice_language_list(), _('Site language when autodetection from browser settings is not available'), false, $this->value('language')); $this->unli(); |