Merge pull request #70 from ajayfroiden/master

Fix: changed the lang file names from messages.php to installer_messages.php

readme.md

@@ -49,7 +49,7 @@ You will notice additional files and folders appear in your project :
  - `config/installer.php` : In here you can set the requirements along with the folders permissions for your application to run, by default the array cotaines the default requirements for a basic Laravel app.
  - `public/installer/assets` : This folder contains a css folder and inside of it you will find a `main.css` file, this file is responsible for the styling of your installer, you can overide the default styling and add your own.
  - `resources/views/vendor/installer` : This folder contains the HTML code for your installer, it is 100% customizable, give it a look and see how nice/clean it is.
- - `resources/lang/en/messages.php` : This file holds all the messages/text, currently only English is available, if your application is in another language, you can copy/past it in your language folder and modify it the way you want. If you wanna help us provide more languages for this awesome package please send a pull request https://github.com/RachidLaasri/LaravelInstaller/pulls.
+ - `resources/lang/en/installer_messages.php` : This file holds all the messages/text, currently only English is available, if your application is in another language, you can copy/past it in your language folder and modify it the way you want. If you wanna help us provide more languages for this awesome package please send a pull request https://github.com/RachidLaasri/LaravelInstaller/pulls.
 
 ## Installing and updating your application
 

src/Helpers/DatabaseManager.php

@@ -53,7 +53,7 @@ private function seed()
             return $this->response($e->getMessage());
         }
 
-        return $this->response(trans('messages.final.finished'), 'success');
+        return $this->response(trans('installer_messages.final.finished'), 'success');
     }
 
     /**

src/Helpers/EnvironmentManager.php

@@ -52,13 +52,13 @@ public function getEnvContent()
      */
     public function saveFile(Request $input)
     {
-        $message = trans('messages.environment.success');
+        $message = trans('installer_messages.environment.success');
 
         try {
             file_put_contents($this->envPath, $input->get('envConfig'));
         }
         catch(Exception $e) {
-            $message = trans('messages.environment.errors');
+            $message = trans('installer_messages.environment.errors');
         }
 
         return $message;

src/Views/environment.blade.php

@@ -1,6 +1,6 @@
 @extends('vendor.installer.layouts.master')
 
-@section('title', trans('messages.environment.title'))
+@section('title', trans('installer_messages.environment.title'))
 @section('container')
     @if (session('message'))
         <p class="alert">{{ session('message') }}</p>
@@ -9,13 +9,13 @@
         {!! csrf_field() !!}
         <textarea class="textarea" name="envConfig">{{ $envConfig }}</textarea>
         <div class="buttons buttons--right">
-             <button class="button button--light" type="submit">{{ trans('messages.environment.save') }}</button>
+             <button class="button button--light" type="submit">{{ trans('installer_messages.environment.save') }}</button>
         </div>
     </form>
     @if( ! isset($environment['errors']))
         <div class="buttons">
             <a class="button" href="{{ route('LaravelInstaller::requirements') }}">
-                {{ trans('messages.next') }}
+                {{ trans('installer_messages.next') }}
             </a>
         </div>
     @endif

src/Views/finished.blade.php

@@ -1,9 +1,9 @@
 @extends('vendor.installer.layouts.master')
 
-@section('title', trans('messages.final.title'))
+@section('title', trans('installer_messages.final.title'))
 @section('container')
     <p class="paragraph">{{ session('message')['message'] }}</p>
     <div class="buttons">
-        <a href="{{ url('/') }}" class="button">{{ trans('messages.final.exit') }}</a>
+        <a href="{{ url('/') }}" class="button">{{ trans('installer_messages.final.exit') }}</a>
     </div>
 @stop

src/Views/layouts/master-update.blade.php

@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>{{ trans('messages.updater.title') }}</title>
+        <title>{{ trans('installer_messages.updater.title') }}</title>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-16x16.png') }}" sizes="16x16"/>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-32x32.png') }}" sizes="32x32"/>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-96x96.png') }}" sizes="96x96"/>

src/Views/layouts/master.blade.php

@@ -3,7 +3,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <title>{{ trans('messages.title') }}</title>
+        <title>{{ trans('installer_messages.title') }}</title>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-16x16.png') }}" sizes="16x16"/>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-32x32.png') }}" sizes="32x32"/>
         <link rel="icon" type="image/png" href="{{ asset('installer/img/favicon/favicon-96x96.png') }}" sizes="96x96"/>

src/Views/permissions.blade.php

@@ -1,6 +1,6 @@
 @extends('vendor.installer.layouts.master')
 
-@section('title', trans('messages.permissions.title'))
+@section('title', trans('installer_messages.permissions.title'))
 @section('container')
     <ul class="list">
         @foreach($permissions['permissions'] as $permission)
@@ -13,7 +13,7 @@
     @if ( ! isset($permissions['errors']))
         <div class="buttons">
             <a class="button" href="{{ route('LaravelInstaller::database') }}">
-                {{ trans('messages.install') }}
+                {{ trans('installer_messages.install') }}
             </a>
         </div>
     @endif

src/Views/requirements.blade.php

@@ -1,6 +1,6 @@
 @extends('vendor.installer.layouts.master')
 
-@section('title', trans('messages.requirements.title'))
+@section('title', trans('installer_messages.requirements.title'))
 @section('container')
     @foreach($requirements['requirements'] as $type => $requirement)
         <h5>{{ ucfirst($type) }}</h5>
@@ -14,7 +14,7 @@
     @if ( ! isset($requirements['errors']))
         <div class="buttons">
             <a class="button" href="{{ route('LaravelInstaller::permissions') }}">
-                {{ trans('messages.next') }}
+                {{ trans('installer_messages.next') }}
             </a>
         </div>
     @endif

src/Views/update/finished.blade.php

@@ -1,9 +1,9 @@
 @extends('vendor.installer.layouts.master-update')
 
-@section('title', trans('messages.updater.final.title'))
+@section('title', trans('installer_messages.updater.final.title'))
 @section('container')
     <p class="paragraph">{{ session('message')['message'] }}</p>
     <div class="buttons">
-        <a href="{{ url('/') }}" class="button">{{ trans('messages.updater.final.exit') }}</a>
+        <a href="{{ url('/') }}" class="button">{{ trans('installer_messages.updater.final.exit') }}</a>
     </div>
 @stop

src/Views/update/overview.blade.php

@@ -1,9 +1,9 @@
 @extends('vendor.installer.layouts.master-update')
 
-@section('title', trans('messages.updater.welcome.title'))
+@section('title', trans('installer_messages.updater.welcome.title'))
 @section('container')
     <p class="paragraph">{{ trans_choice('messages.updater.overview.message', $numberOfUpdatesPending, ['number' => $numberOfUpdatesPending]) }}</p>
     <div class="buttons">
-        <a href="{{ route('LaravelUpdater::database') }}" class="button">{{ trans('messages.finish') }}</a>
+        <a href="{{ route('LaravelUpdater::database') }}" class="button">{{ trans('installer_messages.finish') }}</a>
     </div>
 @stop

src/Views/update/welcome.blade.php

@@ -1,9 +1,9 @@
 @extends('vendor.installer.layouts.master-update')
 
-@section('title', trans('messages.updater.welcome.title'))
+@section('title', trans('installer_messages.updater.welcome.title'))
 @section('container')
-    <p class="paragraph">{{ trans('messages.updater.welcome.message') }}</p>
+    <p class="paragraph">{{ trans('installer_messages.updater.welcome.message') }}</p>
     <div class="buttons">
-        <a href="{{ route('LaravelUpdater::overview') }}" class="button">{{ trans('messages.next') }}</a>
+        <a href="{{ route('LaravelUpdater::overview') }}" class="button">{{ trans('installer_messages.next') }}</a>
     </div>
 @stop

src/Views/welcome.blade.php

@@ -1,9 +1,9 @@
 @extends('vendor.installer.layouts.master')
 
-@section('title', trans('messages.welcome.title'))
+@section('title', trans('installer_messages.welcome.title'))
 @section('container')
-    <p class="paragraph">{{ trans('messages.welcome.message') }}</p>
+    <p class="paragraph">{{ trans('installer_messages.welcome.message') }}</p>
     <div class="buttons">
-        <a href="{{ route('LaravelInstaller::environment') }}" class="button">{{ trans('messages.next') }}</a>
+        <a href="{{ route('LaravelInstaller::environment') }}" class="button">{{ trans('installer_messages.next') }}</a>
     </div>
 @stop