fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/HOR-3231 (pull request #6017)

Browse Source 
HOR-3231

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Ronald Quenta
2017-08-25 20:23:53 +00:00
committed by Julio Cesar Laura Avendaño
parent c695f1364f d4ce3b85e6
commit 09c2e31b74
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/src/Maveriks/WebApplication.php
View File

@@ -2,6 +2,7 @@
namespace Maveriks; namespace Maveriks;
use Bootstrap;
use Maveriks\Util; use Maveriks\Util;
use ProcessMaker\Core\System; use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry; use ProcessMaker\Plugins\PluginRegistry;
@@ -487,9 +488,9 @@ class WebApplication
app()->make(Kernel::class)->bootstrap(); app()->make(Kernel::class)->bootstrap();
error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED); error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED);
\Bootstrap::setLanguage(); Bootstrap::setLanguage();
\Bootstrap::LoadTranslationObject((defined("SYS_LANG")) ? SYS_LANG : "en"); Bootstrap::LoadTranslationObject((defined("SYS_LANG")) ? SYS_LANG : "en");
if (empty($workspace)) { if (empty($workspace)) {
return true; return true;
@@ -585,6 +586,11 @@ class WebApplication
define('TIME_ZONE', ini_get('date.timezone')); define('TIME_ZONE', ini_get('date.timezone'));
$oPluginRegistry = PluginRegistry::loadSingleton();
$attributes = $oPluginRegistry->getAttributes();
Bootstrap::LoadTranslationPlugins(defined('SYS_LANG') ? SYS_LANG : "en", $attributes);
// Initialization functions plugins
$oPluginRegistry->init();
//Return //Return
return true; return true;
} }