Merge pull request #3223 from annando/1702-no-language

The language string isn't displayed anymore

diff --cc mod/admin.php
index 5cfeeb376f7e2b6f27c1cbbd474e11d97909d0f5,4b8182dfeec6c58a3a7cbad589a71145b8ad8001..0e4d6057ce7575cb87bf7a12340af148f07c7aad
--- 1/mod/admin.php
--- 2/mod/admin.php
+++ b/mod/admin.php
@@@ -649,8 -649,8 +649,7 @@@ function admin_page_site_post(App $a) 
        $diaspora_enabled       =       ((x($_POST,'diaspora_enabled'))         ? True                                          : False);
        $ssl_policy             =       ((x($_POST,'ssl_policy'))               ? intval($_POST['ssl_policy'])                  : 0);
        $force_ssl              =       ((x($_POST,'force_ssl'))                ? True                                          : False);
 -      $old_share              =       ((x($_POST,'old_share'))                ? True                                          : False);
        $hide_help              =       ((x($_POST,'hide_help'))                ? True                                          : False);
-       $suppress_language      =       ((x($_POST,'suppress_language'))        ? True                                          : False);
        $suppress_tags          =       ((x($_POST,'suppress_tags'))            ? True                                          : False);
        $use_fulltext_engine    =       ((x($_POST,'use_fulltext_engine'))      ? True                                          : False);
        $itemcache              =       ((x($_POST,'itemcache'))                ? notags(trim($_POST['itemcache']))             : '');

diff --cc view/templates/admin_site.tpl
Simple merge