Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

actions/oauthconnectionssettings.php

@@ -99,7 +99,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
 
         $application = $profile->getApplications($offset, $limit);
 
-        $cnt == 0;
+        $cnt = 0;
 
         if (!empty($application)) {
             $al = new ApplicationList($application, $user, $this, true);
@@ -112,7 +112,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
 
         $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE,
                           $this->page, 'connectionssettings',
-                          array('nickname' => $this->user->nickname));
+                          array('nickname' => $user->nickname));
     }
 
     /**

actions/siteadminpanel.php

@@ -277,8 +277,8 @@ class SiteAdminPanelForm extends AdminForm
         $this->unli();
 
         $this->li();
-        $this->out->dropdown('language', _('Language'),
+        $this->out->dropdown('language', _('Default language'),
-                             get_nice_language_list(), _('Default site language'),
+                             get_nice_language_list(), _('Site language when autodetection from browser settings is not available'),
                              false, $this->value('language'));
         $this->unli();
 

index.php

@@ -253,6 +253,7 @@ function main()
     $user = common_current_user();
 
     // initialize language env
+common_log(LOG_DEBUG, "XXX: WAIII");
 
     common_init_language();
 

lib/adminpanelaction.php

@@ -171,6 +171,24 @@ class AdminPanelAction extends Action
         $this->showForm();
     }
 
+    /**
+     * Show content block. Overrided just to add a special class
+     * to the content div to allow styling. 
+     *
+     * @return nothing
+     */
+    function showContentBlock()
+    {
+        $this->elementStart('div', array('id' => 'content', 'class' => 'admin'));
+        $this->showPageTitle();
+        $this->showPageNoticeBlock();
+        $this->elementStart('div', array('id' => 'content_inner'));
+        // show the actual content (forms, lists, whatever)
+        $this->showContent();
+        $this->elementEnd('div');
+        $this->elementEnd('div');
+    }
+
     /**
      * show human-readable instructions for the page, or
      * a success/failure on save.

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,

lib/util.php

@@ -105,12 +105,14 @@ function common_language()
 
     // Otherwise, find the best match for the languages requested by the
     // user's browser...
+    if (common_config('site', 'langdetect')) {
         $httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : null;
         if (!empty($httplang)) {
             $language = client_prefered_language($httplang);
             if ($language)
               return $language;
         }
+    }
 
     // Finally, if none of the above worked, use the site's default...
     return common_config('site', 'language');