From 98752cd3c37e664eb334757ba90b2791ea38fb21 Mon Sep 17 00:00:00 2001
From: Mordi Sacks <mordisacks@gmail.com>
Date: Thu, 9 Mar 2017 00:43:21 +0200
Subject: [PATCH] added mkdir excteption and updated to laravel 5.4

---
 README.md                   | 12 ++++++------
 composer.json               |  4 ++--
 src/I18nServiceProvider.php | 34 ++++++++++++++++++----------------
 3 files changed, 26 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 composer.json
 mode change 100644 => 100755 src/I18nServiceProvider.php

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 4ef6ed0..c851863
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # I18n
-This package is a Laravel 5.2 wrapper for [I18n](https://github.com/MordiSacks/I18n)
+This package is a Laravel wrapper for [I18n](https://github.com/MordiSacks/I18n)
 
 # Installation
 ```
@@ -12,14 +12,14 @@ MordiSacks\LaravelI18n\I18nServiceProvider::class,
 ```
 
 # Usage
-Set your default locale in .env file
-```
-I18N=he_IL
-```
+Set your default locale in app.php config  
 
 This package overrides blade `@lang`
 
 So the following will work
 ```
 <h1>@lang('Hello :name', 'default', ['name' => 'Mordi'])</h1>
-```
\ No newline at end of file
+```
+
+# Changelog 2.1.0
+* Updated to laravel 5.4
\ No newline at end of file
diff --git a/composer.json b/composer.json
old mode 100644
new mode 100755
index de9a1b2..3767edd
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "laravel localisation"
   ],
   "license": "MIT",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "authors": [
     {
       "name": "Mordi Sacks"
@@ -15,7 +15,7 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "laravel/framework": "5.2.*",
+    "laravel/framework": "5.4.*",
     "mordisacks/i18n": "2.0.*"
   },
   "autoload": {
diff --git a/src/I18nServiceProvider.php b/src/I18nServiceProvider.php
old mode 100644
new mode 100755
index 3c0731d..f6efcf2
--- a/src/I18nServiceProvider.php
+++ b/src/I18nServiceProvider.php
@@ -1,31 +1,33 @@
 <?php
 namespace MordiSacks\LaravelI18n;
 
+use Exception;
 use Illuminate\Support\ServiceProvider;
 use MordiSacks\I18n\I18n;
 
 class I18nServiceProvider extends ServiceProvider
 {
 
-	public function boot()
-	{
-		if(!file_exists(resource_path('i18n')))
-		{
-			mkdir(resource_path('i18n'), 0755);
-		}
+    public function boot()
+    {
+        if (!file_exists(resource_path('i18n'))) {
+            if (!@mkdir(resource_path('i18n'), 0755, $recursive = true)) {
+                $error = error_get_last();
+                throw new Exception('cant create directory ' . $error['message'], 1);
+            }
+        }
 
-		I18n::$dir = resource_path('i18n');
+        I18n::$dir = resource_path('i18n');
 
-		I18n::$locale = env('I18N');
+        I18n::$locale = config('app.locale');
 
-		\Blade::directive('lang', function ($expression)
-		{
-			return "<?php echo __{$expression}; ?>";
-		});
-	}
+        \Blade::directive('lang', function ($expression) {
+            return "<?php echo MordiSacks\\I18n\\I18n::translate({$expression}); ?>";
+        });
+    }
 
-	public function register()
-	{
+    public function register()
+    {
 
-	}
+    }
 }
\ No newline at end of file