Implemented service provider functionality

2 files changed, 13 insertions, 2 deletions

diff --git a/includes/engelsystem_provider.php b/includes/engelsystem_provider.php
index e1669c57..3067ab62 100644
--- a/includes/engelsystem_provider.php
+++ b/includes/engelsystem_provider.php
@@ -27,6 +27,13 @@ $app = new Application(realpath(__DIR__ . DIRECTORY_SEPARATOR . '..'));
 
 
 /**
+ * Bootstrap application
+ */
+$appConfig = $app->make(Config::class);
+$appConfig->set(app('path.config') . '/app.php');
+$app->bootstrap($appConfig);
+
+/**
  * Load configuration
  */
 $config = new Config();
@@ -40,6 +47,10 @@ if (file_exists(__DIR__ . '/../config/config.php')) {
     ));
 }
 
+
+/**
+ * Configure application
+ */
 date_default_timezone_set($config->get('timezone'));
 
 
@@ -55,7 +66,7 @@ $app->instance('request', $request);
 /**
  * Check for maintenance
  */
-if ($config->get('maintenance')) {
+if ($app->get('config')->get('maintenance')) {
     echo file_get_contents(__DIR__ . '/../templates/maintenance.html');
     die();
 }
diff --git a/includes/helper/internationalization_helper.php b/includes/helper/internationalization_helper.php
index efbe5db5..7fa6518b 100644
--- a/includes/helper/internationalization_helper.php
+++ b/includes/helper/internationalization_helper.php
@@ -36,7 +36,7 @@ function gettext_init()
     }
 
     gettext_locale();
-    bindtextdomain('default', realpath(__DIR__ . '/../../locale'));
+    bindtextdomain('default', app('path.lang'));
     bind_textdomain_codeset('default', 'UTF-8');
     textdomain('default');
 }