From 99113d5c7653b42739322117b818ab8a42d93bdd Mon Sep 17 00:00:00 2001 From: Jerome De Almeida Date: Wed, 4 Jan 2017 15:34:24 +0100 Subject: [PATCH] rollback config --- config/autoload/config.local.php.dist | 15 +++------------ config/autoload/global.php | 4 ++-- config/autoload/local.php.dist | 7 +++++++ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/config/autoload/config.local.php.dist b/config/autoload/config.local.php.dist index 5941419..b02dce4 100755 --- a/config/autoload/config.local.php.dist +++ b/config/autoload/config.local.php.dist @@ -2,18 +2,9 @@ return [ 'languages' => [ - 'fr' => [ - 'index' => 1, - 'label' => 'Français', - ], - 'en' => [ - 'index' => 2, - 'label' => 'English', - ], - 'de' => [ - 'index' => 3, - 'label' => 'Deutsch', - ], + 1 => 'Français', + 2 => 'English', + 3 => 'Deutsch' ], 'defaultLanguageIndex' => 2 ]; \ No newline at end of file diff --git a/config/autoload/global.php b/config/autoload/global.php index e8fc108..39d5722 100644 --- a/config/autoload/global.php +++ b/config/autoload/global.php @@ -25,7 +25,7 @@ return array( 'host' => 'localhost', 'port' => 3306, 'user' => 'user', - 'password' => 'password', + 'password' => '', 'dbname' => 'monarc_common', 'charset' => 'utf8', 'driverOptions' => array( @@ -39,7 +39,7 @@ return array( 'host' => 'localhost', 'port' => 3306, 'user' => 'root', - 'password' => 'password', + 'password' => '', 'dbname' => 'monarc_cli', 'charset' => 'utf8', 'driverOptions' => array( diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist index a726764..f20e523 100644 --- a/config/autoload/local.php.dist +++ b/config/autoload/local.php.dist @@ -33,6 +33,13 @@ return array( ), ), + 'languages' => [ + 1 => 'Français', + 2 => 'English', + 3 => 'Deutsch' + ], + 'defaultLanguageIndex' => 2, + /* Link with (ModuleCore) config['languages'] = [ 'fr' => array(