From f2a9b2faec10094514c16ea2c3539f910dc2bc62 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Sep 2013 05:26:33 -0400
Subject: [PATCH] - Added warning message to language import script. - Added switch to disable import function in config.inc.php - Merged language files.
---
install/tpl/config.inc.php.master | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 8c8bedd..b217603 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -148,9 +148,11 @@
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/header_logo.png';
+
//** Default Language and Timezone
$conf['language'] = '{language}';
$conf['debug_language'] = false;
+$conf['language_file_import_enabled'] = {language_file_import_enabled}; // Bool value: true / false
//* Complete timezone list: http://php.net/manual/en/timezones.php
$conf['timezone'] = '{timezone}';
--
Gitblit v1.9.1