From 8a10d3145682cd0306690e04479f95e1cc5cf061 Mon Sep 17 00:00:00 2001
From: Ajay Kumar Choudhary <ajay@froiden.com>
Date: Mon, 6 Feb 2017 11:29:30 +0530
Subject: [PATCH] Fix: changed the lang file names from messages.php to
 installer_messages.php

---
 readme.md                                               | 2 +-
 src/Helpers/DatabaseManager.php                         | 2 +-
 src/Helpers/EnvironmentManager.php                      | 4 ++--
 src/Lang/ar/{messages.php => installer_messages.php}    | 0
 src/Lang/de/{messages.php => installer_messages.php}    | 0
 src/Lang/en/{messages.php => installer_messages.php}    | 0
 src/Lang/es/{messages.php => installer_messages.php}    | 0
 src/Lang/et/{messages.php => installer_messages.php}    | 0
 src/Lang/fa/{messages.php => installer_messages.php}    | 0
 src/Lang/fr/{messages.php => installer_messages.php}    | 0
 src/Lang/gr/{messages.php => installer_messages.php}    | 0
 src/Lang/it/{messages.php => installer_messages.php}    | 0
 src/Lang/nl/{messages.php => installer_messages.php}    | 0
 src/Lang/pl/{messages.php => installer_messages.php}    | 0
 src/Lang/pt-br/{messages.php => installer_messages.php} | 0
 src/Lang/pt/{messages.php => installer_messages.php}    | 0
 src/Lang/ro/{messages.php => installer_messages.php}    | 0
 src/Lang/ru/{messages.php => installer_messages.php}    | 0
 src/Lang/tr/{messages.php => installer_messages.php}    | 0
 src/Lang/zh-CN/{messages.php => installer_messages.php} | 0
 src/Lang/zh-TW/{messages.php => installer_messages.php} | 0
 src/Views/environment.blade.php                         | 6 +++---
 src/Views/finished.blade.php                            | 4 ++--
 src/Views/layouts/master-update.blade.php               | 2 +-
 src/Views/layouts/master.blade.php                      | 2 +-
 src/Views/permissions.blade.php                         | 4 ++--
 src/Views/requirements.blade.php                        | 4 ++--
 src/Views/update/finished.blade.php                     | 4 ++--
 src/Views/update/overview.blade.php                     | 4 ++--
 src/Views/update/welcome.blade.php                      | 6 +++---
 src/Views/welcome.blade.php                             | 6 +++---
 31 files changed, 25 insertions(+), 25 deletions(-)
 rename src/Lang/ar/{messages.php => installer_messages.php} (100%)
 rename src/Lang/de/{messages.php => installer_messages.php} (100%)
 rename src/Lang/en/{messages.php => installer_messages.php} (100%)
 rename src/Lang/es/{messages.php => installer_messages.php} (100%)
 rename src/Lang/et/{messages.php => installer_messages.php} (100%)
 rename src/Lang/fa/{messages.php => installer_messages.php} (100%)
 rename src/Lang/fr/{messages.php => installer_messages.php} (100%)
 rename src/Lang/gr/{messages.php => installer_messages.php} (100%)
 rename src/Lang/it/{messages.php => installer_messages.php} (100%)
 rename src/Lang/nl/{messages.php => installer_messages.php} (100%)
 rename src/Lang/pl/{messages.php => installer_messages.php} (100%)
 rename src/Lang/pt-br/{messages.php => installer_messages.php} (100%)
 rename src/Lang/pt/{messages.php => installer_messages.php} (100%)
 rename src/Lang/ro/{messages.php => installer_messages.php} (100%)
 rename src/Lang/ru/{messages.php => installer_messages.php} (100%)
 rename src/Lang/tr/{messages.php => installer_messages.php} (100%)
 rename src/Lang/zh-CN/{messages.php => installer_messages.php} (100%)
 rename src/Lang/zh-TW/{messages.php => installer_messages.php} (100%)

diff --git a/readme.md b/readme.md
index 6260a8d..97d4e0d 100644
--- a/readme.md
+++ b/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
 
diff --git a/src/Helpers/DatabaseManager.php b/src/Helpers/DatabaseManager.php
index dc17f1f..d66f478 100644
--- a/src/Helpers/DatabaseManager.php
+++ b/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');
     }
 
     /**
diff --git a/src/Helpers/EnvironmentManager.php b/src/Helpers/EnvironmentManager.php
index 091e17e..9f2c820 100644
--- a/src/Helpers/EnvironmentManager.php
+++ b/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;
diff --git a/src/Lang/ar/messages.php b/src/Lang/ar/installer_messages.php
similarity index 100%
rename from src/Lang/ar/messages.php
rename to src/Lang/ar/installer_messages.php
diff --git a/src/Lang/de/messages.php b/src/Lang/de/installer_messages.php
similarity index 100%
rename from src/Lang/de/messages.php
rename to src/Lang/de/installer_messages.php
diff --git a/src/Lang/en/messages.php b/src/Lang/en/installer_messages.php
similarity index 100%
rename from src/Lang/en/messages.php
rename to src/Lang/en/installer_messages.php
diff --git a/src/Lang/es/messages.php b/src/Lang/es/installer_messages.php
similarity index 100%
rename from src/Lang/es/messages.php
rename to src/Lang/es/installer_messages.php
diff --git a/src/Lang/et/messages.php b/src/Lang/et/installer_messages.php
similarity index 100%
rename from src/Lang/et/messages.php
rename to src/Lang/et/installer_messages.php
diff --git a/src/Lang/fa/messages.php b/src/Lang/fa/installer_messages.php
similarity index 100%
rename from src/Lang/fa/messages.php
rename to src/Lang/fa/installer_messages.php
diff --git a/src/Lang/fr/messages.php b/src/Lang/fr/installer_messages.php
similarity index 100%
rename from src/Lang/fr/messages.php
rename to src/Lang/fr/installer_messages.php
diff --git a/src/Lang/gr/messages.php b/src/Lang/gr/installer_messages.php
similarity index 100%
rename from src/Lang/gr/messages.php
rename to src/Lang/gr/installer_messages.php
diff --git a/src/Lang/it/messages.php b/src/Lang/it/installer_messages.php
similarity index 100%
rename from src/Lang/it/messages.php
rename to src/Lang/it/installer_messages.php
diff --git a/src/Lang/nl/messages.php b/src/Lang/nl/installer_messages.php
similarity index 100%
rename from src/Lang/nl/messages.php
rename to src/Lang/nl/installer_messages.php
diff --git a/src/Lang/pl/messages.php b/src/Lang/pl/installer_messages.php
similarity index 100%
rename from src/Lang/pl/messages.php
rename to src/Lang/pl/installer_messages.php
diff --git a/src/Lang/pt-br/messages.php b/src/Lang/pt-br/installer_messages.php
similarity index 100%
rename from src/Lang/pt-br/messages.php
rename to src/Lang/pt-br/installer_messages.php
diff --git a/src/Lang/pt/messages.php b/src/Lang/pt/installer_messages.php
similarity index 100%
rename from src/Lang/pt/messages.php
rename to src/Lang/pt/installer_messages.php
diff --git a/src/Lang/ro/messages.php b/src/Lang/ro/installer_messages.php
similarity index 100%
rename from src/Lang/ro/messages.php
rename to src/Lang/ro/installer_messages.php
diff --git a/src/Lang/ru/messages.php b/src/Lang/ru/installer_messages.php
similarity index 100%
rename from src/Lang/ru/messages.php
rename to src/Lang/ru/installer_messages.php
diff --git a/src/Lang/tr/messages.php b/src/Lang/tr/installer_messages.php
similarity index 100%
rename from src/Lang/tr/messages.php
rename to src/Lang/tr/installer_messages.php
diff --git a/src/Lang/zh-CN/messages.php b/src/Lang/zh-CN/installer_messages.php
similarity index 100%
rename from src/Lang/zh-CN/messages.php
rename to src/Lang/zh-CN/installer_messages.php
diff --git a/src/Lang/zh-TW/messages.php b/src/Lang/zh-TW/installer_messages.php
similarity index 100%
rename from src/Lang/zh-TW/messages.php
rename to src/Lang/zh-TW/installer_messages.php
diff --git a/src/Views/environment.blade.php b/src/Views/environment.blade.php
index 2142620..9f9e9fd 100644
--- a/src/Views/environment.blade.php
+++ b/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
diff --git a/src/Views/finished.blade.php b/src/Views/finished.blade.php
index ffd6cfd..a959780 100644
--- a/src/Views/finished.blade.php
+++ b/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
diff --git a/src/Views/layouts/master-update.blade.php b/src/Views/layouts/master-update.blade.php
index ac668de..9aecf12 100644
--- a/src/Views/layouts/master-update.blade.php
+++ b/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"/>
diff --git a/src/Views/layouts/master.blade.php b/src/Views/layouts/master.blade.php
index 5434b2c..7978712 100644
--- a/src/Views/layouts/master.blade.php
+++ b/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"/>
diff --git a/src/Views/permissions.blade.php b/src/Views/permissions.blade.php
index fb1d02d..c96031a 100644
--- a/src/Views/permissions.blade.php
+++ b/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
diff --git a/src/Views/requirements.blade.php b/src/Views/requirements.blade.php
index 6da8e36..10f1913 100644
--- a/src/Views/requirements.blade.php
+++ b/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
diff --git a/src/Views/update/finished.blade.php b/src/Views/update/finished.blade.php
index eb0561a..50639ca 100644
--- a/src/Views/update/finished.blade.php
+++ b/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
diff --git a/src/Views/update/overview.blade.php b/src/Views/update/overview.blade.php
index 1347612..6f2ac04 100644
--- a/src/Views/update/overview.blade.php
+++ b/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
diff --git a/src/Views/update/welcome.blade.php b/src/Views/update/welcome.blade.php
index 61510e6..cb94fc2 100644
--- a/src/Views/update/welcome.blade.php
+++ b/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
diff --git a/src/Views/welcome.blade.php b/src/Views/welcome.blade.php
index cabcb01..48eda30 100644
--- a/src/Views/welcome.blade.php
+++ b/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