Issue 2241: added language selector to the admin wizard

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

diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
index 6b3bda617366366ef9c52d0a928d23db48e917fe..971bb504824ebb8b76acc8713c3ded5859ea3f4f 100644 (file)
--- a/view/templates/htconfig.tpl
+++ b/view/templates/htconfig.tpl
@@ -20,6 +20,10 @@ $a->path = '{{$urlpath}}';
 
 $default_timezone = '{{$timezone}}';
 
+// Default system language
+
+$a->config['system']['language'] = '{{$language}}';
+
 // What is your site name?
 
 $a->config['sitename'] = "My Friend Network";

diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl
index 8d6823f11414f4902d83fb85200dc9506f36284b..5584e143652beb37862e92f20be76f976345984d 100644 (file)
--- a/view/templates/install_settings.tpl
+++ b/view/templates/install_settings.tpl
@@ -19,6 +19,7 @@
 
 {{include file="field_input.tpl" field=$adminmail}}
 {{$timezone}}
+{{include file="field_select.tpl" field=$language}}
 
 <input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />