Merge pull request #104 from chriscase/master

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 173df6d4b9e834a8841ef7de66ef9a4e601e16dc..b5f056df7c0537eeb67709714996ad9a9ebb0bb3 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -14,7 +14,7 @@ function install_post(&$a) {
        $phpath = notags(trim($_POST['phpath']));
 
        require_once("dba.php");
-       unset ($db);
+       unset($db);
        $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
 
        if(mysqli_connect_errno()) {
@@ -37,7 +37,7 @@ function install_post(&$a) {
 
        notice( t('Connected to database.') . EOL);
 
-       $tpl = load_view_file('view/htconfig.tpl');
+       $tpl = get_intltext_template('htconfig.tpl');
        $txt = replace_macros($tpl,array(
                '$dbhost' => $dbhost,
                '$dbuser' => $dbuser,
@@ -116,8 +116,18 @@ function install_content(&$a) {
 
        require_once('datetime.php');
 
-       $tpl = load_view_file('view/install_db.tpl');
+       $tpl = get_markup_template('install_db.tpl');
        $o .= replace_macros($tpl, array(
+               '$lbl_01' => t('Friendika Social Network'),
+               '$lbl_02' => t('Installation'),
+               '$lbl_03' => t('In order to install Friendika we need to know how to contact your database.'),
+               '$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+               '$lbl_05' => t('The database you specify below must already exist. If it does not, please create it before continuing.'),
+               '$lbl_06' => t('Database Server Name'),
+               '$lbl_07' => t('Database Login Name'),
+               '$lbl_08' => t('Database Login Password'),
+               '$lbl_09' => t('Database Name'),
+               '$lbl_10' => t('Please select a default timezone for your website'),
                '$baseurl' => $a->get_baseurl(),
                '$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()),
                '$submit' => t('Submit'),