mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2440 from tobiasd/issue2241

Browse source 
Issue 2241: added language selector to the admin wizard
This commit is contained in:
fabrixxm 2016-04-08 10:41:36 +02:00
parent dfa5183774 ac9d392264
commit 0370a2e6f3
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/install.php
View file

@ -77,6 +77,7 @@ function install_post(&$a) {
$dbdata = notags(trim($_POST['dbdata'])); $dbdata = notags(trim($_POST['dbdata']));
$phpath = notags(trim($_POST['phpath'])); $phpath = notags(trim($_POST['phpath']));
$timezone = notags(trim($_POST['timezone'])); $timezone = notags(trim($_POST['timezone']));
$language = notags(trim($_POST['language']));
$adminmail = notags(trim($_POST['adminmail'])); $adminmail = notags(trim($_POST['adminmail']));
// connect to db // connect to db
@ -89,6 +90,7 @@ function install_post(&$a) {
'$dbpass' => $dbpass, '$dbpass' => $dbpass,
'$dbdata' => $dbdata, '$dbdata' => $dbdata,
'$timezone' => $timezone, '$timezone' => $timezone,
'$language' => $language,
'$urlpath' => $urlpath, '$urlpath' => $urlpath,
'$phpath' => $phpath, '$phpath' => $phpath,
'$adminmail' => $adminmail '$adminmail' => $adminmail
@ -273,6 +275,8 @@ function install_content(&$a) {
$adminmail = notags(trim($_POST['adminmail'])); $adminmail = notags(trim($_POST['adminmail']));
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
/* Installed langs */
$lang_choices = get_avaiable_languages();
$tpl = get_markup_template('install_settings.tpl'); $tpl = get_markup_template('install_settings.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
@ -291,7 +295,7 @@ function install_content(&$a) {
'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''), '$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
'$language' => array('language', t('System Language:'), 'en', t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices),
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),

4
view/templates/htconfig.tpl
View file

@ -20,6 +20,10 @@ $a->path = '{{$urlpath}}';
$default_timezone = '{{$timezone}}'; $default_timezone = '{{$timezone}}';
// Default system language
$a->config['system']['language'] = '{{$language}}';
// What is your site name? // What is your site name?
$a->config['sitename'] = "My Friend Network"; $a->config['sitename'] = "My Friend Network";

1
view/templates/install_settings.tpl
View file

@ -19,6 +19,7 @@
{{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$adminmail}}
{{$timezone}} {{$timezone}}
{{include file="field_select.tpl" field=$language}}
<input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />