aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install.php5
-rw-r--r--language/en_UK.iso-8859-1/common.lang.php1
2 files changed, 4 insertions, 2 deletions
diff --git a/install.php b/install.php
index 3d520be99..25d121972 100644
--- a/install.php
+++ b/install.php
@@ -150,9 +150,10 @@ if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/instal
{
$language = 'en_EN';
}
+
+include( './language/'.$language.'/common.lang.php' );
include( './language/'.$language.'/install.lang.php' );
include( './language/'.$language.'/admin.lang.php' );
-include_once(PHPWG_ROOT_PATH . 'language/infos.lang.php');
// Obtain various vars
$dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
@@ -342,7 +343,7 @@ $template->assign_vars(array(
'F_ADMIN_EMAIL'=>$admin_mail,
'F_LANG_SELECT'=>language_select($language),
- 'T_CONTENT_ENCODING' => $lang['default']['charset']
+ 'T_CONTENT_ENCODING' => $lang_info['charset']
));
//-------------------------------------------------------- errors & infos display
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 2ca66b1ff..3c6b38042 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -121,6 +121,7 @@ $lang['favorites'] = 'Favorites';
$lang['search_result'] = 'Search results';
$lang['about_page_title'] = 'About PhpWebGallery';
$lang['about_title'] = 'About...';
+if (isset($conf))
$lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Information about PhpWebGallery</div>
<ul>
<li>This website uses <a href="'.$conf['site_url'].'" style="text-decoration:underline">PhpWebGallery</a> release '.$conf['version'].'. PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>