configurable default language

This commit is contained in:
Claude 2012-04-18 17:38:49 +02:00
parent 4bded6738f
commit 4ae7e3cb1d
2 changed files with 15 additions and 2 deletions

View File

@ -54,6 +54,14 @@ $config['cron_key'] = '';
**/
$config['per_page'] = 10;
/**
* Default language
*
* Preselected language. See application/config/geshi_languages.php for valid values (array keys)
*
**/
$config['default_language'] = 'text';
/**
* Name for anonymous poster
*

View File

@ -124,7 +124,7 @@ class Main extends CI_Controller
}
}
function _form_prep($lang = 'php', $title = '', $paste = '', $reply = false)
function _form_prep($lang = false, $title = '', $paste = '', $reply = false)
{
$this->load->model('languages');
$this->load->helper('form');
@ -147,7 +147,12 @@ class Main extends CI_Controller
$data['title_set'] = $title;
$data['reply'] = $reply;
if ($lang != 'php' or ($lang == 'php' and $this->db_session->userdata('lang') == false))
if (!$lang)
{
$lang = $this->config->item('default_language');
}
if ($this->db_session->userdata('lang') == false)
{
$data['lang_set'] = $lang;
}