Merge branch 'master' of bitbucket.org:colosa/processmaker

2014-03-18 12:02:36 -04:00
parent d9d034ff75 d4aa545816
commit 3681d98952
1 changed files with 2 additions and 0 deletions
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -372,6 +372,8 @@ class WebApplication

        \Propel::init(PATH_CONFIG . "databases.php");

+        \Bootstrap::LoadTranslationObject(defined( 'SYS_LANG' ) ? SYS_LANG : "en");
+
        return true;
    }
 }