From 22ffb76cb5941ac3dc19b4b9fb54cb2dfa56e673 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Tue, 20 Oct 2015 22:07:35 +1030
Subject: [PATCH] Fix installation

---
 src/Database/DatabaseServiceProvider.php | 2 +-
 src/Install/Console/InstallCommand.php   | 2 +-
 src/Locale/LocaleServiceProvider.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Database/DatabaseServiceProvider.php b/src/Database/DatabaseServiceProvider.php
index e24499720..743012dd6 100644
--- a/src/Database/DatabaseServiceProvider.php
+++ b/src/Database/DatabaseServiceProvider.php
@@ -27,7 +27,7 @@ class DatabaseServiceProvider extends AbstractServiceProvider
         $this->app->singleton('flarum.db', function () {
             $factory = new ConnectionFactory($this->app);
 
-            $connection = $factory->make($this->app->make('flarum.config')['database']);
+            $connection = $factory->make($this->app->config('database'));
             $connection->setEventDispatcher($this->app->make('Illuminate\Contracts\Events\Dispatcher'));
             $connection->setFetchMode(PDO::FETCH_CLASS);
 
diff --git a/src/Install/Console/InstallCommand.php b/src/Install/Console/InstallCommand.php
index 6b75516a9..1bd219f00 100644
--- a/src/Install/Console/InstallCommand.php
+++ b/src/Install/Console/InstallCommand.php
@@ -238,7 +238,7 @@ class InstallCommand extends AbstractCommand
 
     protected function writeSettings()
     {
-        $settings = $this->application->make('Flarum\Settings\SettingsRepository');
+        $settings = $this->application->make('Flarum\Settings\SettingsRepositoryInterface');
 
         $this->info('Writing default settings');
 
diff --git a/src/Locale/LocaleServiceProvider.php b/src/Locale/LocaleServiceProvider.php
index d1271312b..ed5b30d87 100644
--- a/src/Locale/LocaleServiceProvider.php
+++ b/src/Locale/LocaleServiceProvider.php
@@ -37,7 +37,7 @@ class LocaleServiceProvider extends AbstractServiceProvider
         $this->app->alias('Flarum\Locale\LocaleManager', 'flarum.localeManager');
 
         $this->app->singleton('translator', function () {
-            $defaultLocale = $this->app->make('flarum.settings')->get('default_locale');
+            $defaultLocale = $this->app->isInstalled() ? $this->app->make('flarum.settings')->get('default_locale') : 'en';
 
             $translator = new Translator($defaultLocale, new MessageSelector());
             $translator->setFallbackLocales([$defaultLocale]);