Monarc
/
MonarcAppFO
mirror of https://github.com/monarc-project/MonarcAppFO
1
0
Fork 0
Code Issues Releases Wiki Activity

Uodated the core and client packages.

pull/430/head
Ruslan Baidan 2022-03-08 12:59:30 +01:00
parent 9ed22f6f56
commit affa21fc88
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
5 changed files with 1143 additions and 1215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -66,7 +66,10 @@
} }
}, },
"config": { "config": {
"bin-dir": "bin/" "bin-dir": "bin/",
"allow-plugins": {
"laminas/laminas-dependency-plugin": true
}
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true

2339
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

6
config/autoload/global.php
View File

@ -11,15 +11,15 @@
* file. * file.
*/ */
use Doctrine\DBAL\Driver\PDOMySql\Driver; use Doctrine\DBAL\Driver\PDO\MySql\Driver;
use Monarc\Core\Service\DoctrineCacheServiceFactory; use Monarc\Core\Service\DoctrineCacheServiceFactory;
use Monarc\Core\Service\DoctrineLoggerFactory; use Monarc\Core\Service\DoctrineLoggerFactory;
$appconfdir = getenv('APP_CONF_DIR') ?? ''; $appconfdir = getenv('APP_CONF_DIR') ?? '';
$datapath = "data"; $datapath = "data";
if( ! empty($appconfdir) ){ if (!empty($appconfdir)) {
$datapath = $appconfdir.'/data'; $datapath = $appconfdir . '/data';
} }
return array( return array(

2
config/autoload/languages.local.php.dist
View File

@ -39,5 +39,5 @@ return array(
] ]
*/ */
'activeLanguages' => array('fr','en','de','nl','es','ro','it','ja','pl','pt','ru','zh'), 'activeLanguages' => array('fr','en','de','nl','es','ro','it','ja','pl','pt','zh'),
); );

6
config/autoload/local.php.dist
View File

@ -63,10 +63,6 @@ return [
'index' => 7, 'index' => 7,
'label' => 'Italian', 'label' => 'Italian',
], ],
'ru' => [
'index' => 8,
'label' => 'Russian',
],
'pt' => [ 'pt' => [
'index' => 9, 'index' => 9,
'label' => 'Portuguese', 'label' => 'Portuguese',
@ -87,7 +83,7 @@ return [
'defaultLanguageIndex' => 1, 'defaultLanguageIndex' => 1,
'activeLanguages' => array('fr','en','de','nl','es','ro','it','ja','pl','pt','ru','zh'), 'activeLanguages' => array('fr','en','de','nl','es','ro','it','ja','pl','pt','zh'),
'appVersion' => $package_json['version'], 'appVersion' => $package_json['version'],