From e4bdf11a7d31af8832d745d787e5a1250cfe623f Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Wed, 13 Feb 2019 17:42:07 +0530
Subject: [PATCH] lang added

---
 .../Customer/CustomerController.php           |  8 +++---
 .../Customer/CustomerGroupController.php      |  4 +--
 .../Controllers/Sales/InvoiceController.php   |  8 +++---
 .../Controllers/Sales/OrderController.php     |  6 ++---
 .../Controllers/Sales/ShipmentController.php  |  8 +++---
 .../Admin/src/Resources/lang/en/app.php       | 25 ++++++++++++++++---
 .../views/customers/reviews/edit.blade.php    |  4 +--
 .../views/layouts/anonymous-master.blade.php  |  6 ++---
 .../Http/Controllers/AttributeController.php  |  8 +++---
 .../Http/Controllers/CategoryController.php   |  2 +-
 .../Http/Controllers/ChannelController.php    |  2 +-
 .../Http/Controllers/ProductController.php    |  2 +-
 .../src/Http/Controllers/ReviewController.php |  4 +--
 .../views/products/list/toolbar.blade.php     |  2 --
 .../Http/Controllers/AccountController.php    |  4 +--
 .../Http/Controllers/SessionController.php    |  4 +--
 .../src/Http/Controllers/UserController.php   |  2 +-
 17 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
index bbb2bfaa6..effe2dd98 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -88,7 +88,7 @@ class CustomerController extends Controller
 
         $channelName = $this->channel->all();
 
-        return view($this->_config['view'],compact('customerGroup','channelName'));
+        return view($this->_config['view'], compact('customerGroup','channelName'));
     }
 
      /**
@@ -107,7 +107,7 @@ class CustomerController extends Controller
             'date_of_birth' => 'date|before:today'
         ]);
 
-        $data=request()->all();
+        $data = request()->all();
 
         $password = bcrypt(rand(100000,10000000));
 
@@ -136,7 +136,7 @@ class CustomerController extends Controller
 
         $channelName = $this->channel->all();
 
-        return view($this->_config['view'],compact('customer', 'customerGroup', 'channelName'));
+        return view($this->_config['view'], compact('customer', 'customerGroup', 'channelName'));
     }
 
      /**
@@ -158,7 +158,7 @@ class CustomerController extends Controller
             'date_of_birth' => 'date|before:today'
         ]);
 
-        $this->customer->update(request()->all(),$id);
+        $this->customer->update(request()->all(), $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer']));
 
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
index b9f16e8ab..d26ca0a97 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
@@ -96,7 +96,7 @@ class CustomerGroupController extends Controller
     {
         $group = $this->customerGroup->findOneWhere(['id'=>$id]);
 
-        return view($this->_config['view'],compact('group'));
+        return view($this->_config['view'], compact('group'));
     }
 
      /**
@@ -112,7 +112,7 @@ class CustomerGroupController extends Controller
             'name' => 'string|required',
         ]);
 
-        $this->customerGroup->update(request()->all(),$id);
+        $this->customerGroup->update(request()->all(), $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group']));
 
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
index f33aec45f..5cfe6bd6c 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php
@@ -92,7 +92,7 @@ class InvoiceController extends Controller
         $order = $this->order->find($orderId);
 
         if (! $order->canInvoice()) {
-            session()->flash('error', 'Order invoice creation is not allowed.');
+            session()->flash('error', trans('admin::app.sales.invoices.creation-error'));
 
             return redirect()->back();
         }
@@ -102,7 +102,7 @@ class InvoiceController extends Controller
         ]);
 
         $data = request()->all();
-        
+
         $haveProductToInvoice = false;
         foreach ($data['invoice']['items'] as $itemId => $qty) {
             if ($qty) {
@@ -112,14 +112,14 @@ class InvoiceController extends Controller
         }
 
         if (! $haveProductToInvoice) {
-            session()->flash('error', 'Invoice can not be created without products.');
+            session()->flash('error', trans('admin::app.sales.invoices.product-error'));
 
             return redirect()->back();
         }
 
         $this->invoice->create(array_merge($data, ['order_id' => $orderId]));
 
-        session()->flash('success', 'Invoice created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Invoice']));
 
         return redirect()->route($this->_config['redirect'], $orderId);
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php
index 542930b6f..a29f05f62 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php
@@ -77,11 +77,11 @@ class OrderController extends Controller
     public function cancel($id)
     {
         $result = $this->order->cancel($id);
-        
+
         if ($result) {
-            session()->flash('success', trans('Order canceled successfully.'));
+            session()->flash('success', trans('admin::app.response.cancel-success', ['name' => 'Order']));
         } else {
-            session()->flash('error', trans('Order can not be canceled.'));
+            session()->flash('error', trans('admin::app.response.cancel-error', ['name' => 'Order']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
index 9a8c67da8..f00399f6a 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php
@@ -92,7 +92,7 @@ class ShipmentController extends Controller
         $order = $this->order->find($orderId);
 
         if (! $order->channel || !$order->canShip()) {
-            session()->flash('error', 'Shipment can not be created for this order.');
+            session()->flash('error', trans('admin::app.sales.shipments.creation-error'));
 
             return redirect()->back();
         }
@@ -112,7 +112,7 @@ class ShipmentController extends Controller
         $order = $this->order->find($orderId);
 
         if (! $order->canShip()) {
-            session()->flash('error', 'Order shipment creation is not allowed.');
+            session()->flash('error', trans('admin::app.sales.shipments.order-error'));
 
             return redirect()->back();
         }
@@ -127,14 +127,14 @@ class ShipmentController extends Controller
         $data = request()->all();
 
         if (! $this->isInventoryValidate($data)) {
-            session()->flash('error', 'Requested quantity is invalid or not available.');
+            session()->flash('error', trans('admin::app.sales.shipments.quantity-invalid'));
 
             return redirect()->back();
         }
 
         $this->shipment->create(array_merge($data, ['order_id' => $orderId]));
 
-        session()->flash('success', 'Shipment created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Shipment']));
 
         return redirect()->route($this->_config['redirect'], $orderId);
     }
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 3a1a8bc0f..1b9a39e6d 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -217,6 +217,10 @@ return [
             'delete-last' => 'At least one admin is required.',
             'delete-success' => 'Success! User deleted',
             'incorrect-password' => 'The password you entered is incorrect',
+            'password-match' => 'Current password does not match.',
+            'account-save' => 'Account changes saved successfully.',
+            'login-error' => 'Please check your credentials and try again.',
+            'activate-warning' => 'Your account is yet to be activated, please contact administrator.'
         ],
 
         'sessions' => [
@@ -301,7 +305,9 @@ return [
             'bill-to' => 'Bill to',
             'ship-to' => 'Ship to',
             'print' => 'Print',
-            'order-date' => 'Order Date'
+            'order-date' => 'Order Date',
+            'creation-error' => 'Order invoice creation is not allowed.',
+            'product-error' => 'Invoice can not be created without products.'
         ],
 
         'shipments' => [
@@ -324,7 +330,10 @@ return [
             'inventory-source' => 'Inventory Source',
             'carrier-title' => 'Carrier Title',
             'tracking-number' => 'Tracking Number',
-            'view-title' => 'Shipment #:shipment_id'
+            'view-title' => 'Shipment #:shipment_id',
+            'creation-error' => 'Shipment can not be created for this order.',
+            'order-error' => 'Order shipment creation is not allowed.',
+            'quantity-invalid' => 'Requested quantity is invalid or not available.',
         ]
     ],
 
@@ -360,7 +369,8 @@ return [
             'variant-already-exist-message' => 'Variant with same attribute options already exists.',
             'add-image-btn-title' => 'Add Image',
             'mass-delete-success' => 'All the selected index of products have been deleted successfully',
-            'mass-update-success' => 'All the selected index of products have been updated successfully'
+            'mass-update-success' => 'All the selected index of products have been updated successfully',
+            'configurable-error' => 'Please select atleast one configurable attribute.'
         ],
 
         'attributes' => [
@@ -772,6 +782,13 @@ return [
         'currency-delete-error' => 'This currency is set as channel base currency so it can not be deleted.',
         'upload-success' => ':name uploaded successfully.',
         'delete-category-root' => 'Cannot delete the root category',
-        'create-root-failure' => 'Category with name root already exists'
+        'create-root-failure' => 'Category with name root already exists',
+        'cancel-success' => ':name canceled successfully.',
+        'cancel-error' => ':name can not be canceled.',
+        'already-taken' => 'The :name has already been taken.'
+    ],
+
+    'footer' => [
+        'copy-right' => '© Copyright 2018 Webkul Software, All rights reserved.'
     ],
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
index 33f882d23..882e98368 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/reviews/edit.blade.php
@@ -42,7 +42,7 @@
                             <div class="control-group">
                                 <label for="name" >{{ __('admin::app.customers.reviews.rating') }}</label>
                                 <div class="stars">
-                                    @for($i = 1; $i <= $review->rating; $i++)
+                                    @for ($i = 1; $i <= $review->rating; $i++)
                                         <span class="icon star-icon"></span>
                                     @endfor
                                 </div>
@@ -67,7 +67,7 @@
 
                             <div class="control-group">
                                 <label for="name" >{{ __('admin::app.customers.reviews.comment') }}</label>
-                                <textarea  class="control" disabled> {{$review->comment}}</textarea>
+                                <textarea  class="control" disabled> {{ $review->comment }}</textarea>
                             </div>
 
                         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
index 2845cc9cb..241d9e529 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/anonymous-master.blade.php
@@ -71,7 +71,7 @@
             <flash-wrapper ref='flashes'></flash-wrapper>
 
             <div class="center-box">
-            
+
                 <div class="adjacent-center">
 
                     <div class="brand-logo">
@@ -82,7 +82,7 @@
 
                     <div class="footer">
                         <p>
-                            © Copyright 2018 Webkul Software, All rights reserved.
+                            {{ trans('admin::app.footer.copy-right') }}
                         </p>
                     </div>
 
@@ -112,6 +112,6 @@
         <script type="text/javascript" src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}"></script>
 
         @yield('javascript')
-        
+
     </body>
 </html>
\ No newline at end of file
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index 9bf7c7879..968d28746 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -81,7 +81,7 @@ class AttributeController extends Controller
 
         $attribute = $this->attribute->create($data);
 
-        session()->flash('success', 'Attribute created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Attribute']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -116,7 +116,7 @@ class AttributeController extends Controller
 
         $attribute = $this->attribute->update(request()->all(), $id);
 
-        session()->flash('success', 'Attribute updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Attribute']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -132,12 +132,12 @@ class AttributeController extends Controller
         $attribute = $this->attribute->findOrFail($id);
 
         if(!$attribute->is_user_defined) {
-            session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'attribute']));
+            session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'Attribute']));
         } else {
             try {
                 $this->attribute->delete($id);
 
-                session()->flash('success', 'Attribute deleted successfully.');
+                session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Attribute']));
 
             } catch(\Exception $e) {
                 session()->flash('error', trans('admin::app.response.attribute-error', ['name' => 'Attribute']));
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index 0d727865f..4cc5328c5 100755
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -126,7 +126,7 @@ class CategoryController extends Controller
         $this->validate(request(), [
             $locale . '.slug' => ['required', new \Webkul\Core\Contracts\Validations\Slug, function ($attribute, $value, $fail) use ($id) {
                 if (! $this->category->isSlugUnique($id, $value)) {
-                    $fail('The :attribute has already been taken.');
+                    $fail(trans('admin::app.response.already-taken', ['name' => 'Category']));
                 }
             }],
             $locale . '.name' => 'required',
diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
index 54292db2c..9c4cdfa0f 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
@@ -148,7 +148,7 @@ class ChannelController extends Controller
     public function destroy($id)
     {
         if ($this->channel->count() == 1) {
-            session()->flash('error', 'At least one channel is required.');
+            session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Channel']));
         } else {
             Event::fire('core.channel.delete.before', $id);
 
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index ac8989707..6adcf99ff 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -141,7 +141,7 @@ class ProductController extends Controller
         }
 
         if (request()->input('type') == 'configurable' && (! request()->has('super_attributes') || ! count(request()->get('super_attributes')))) {
-            session()->flash('error', 'Please select atleast one configurable attribute.');
+            session()->flash('error', trans('admin::app.catalog.products.configurable-error'));
 
             return back();
         }
diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
index ca2a85b6b..683574cc9 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
@@ -92,7 +92,7 @@ class ReviewController extends Controller
 
         Event::fire('customer.review.update.after', $id);
 
-        session()->flash('success', 'Review updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Review']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -111,7 +111,7 @@ class ReviewController extends Controller
 
         Event::fire('customer.review.delete.after', $id);
 
-        session()->flash('success', 'Review Successfully Deleted');
+        session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Review']));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
index df9a258a6..f8413fcc4 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php
@@ -9,8 +9,6 @@
             {{ __('shop::app.products.pager-info', ['showing' => $products->firstItem() . '-' . $products->lastItem(), 'total' => $products->total()]) }}
         </span>
 
-        <span> Men </span>
-
         <span class="sort-filter">
             <i class="icon sort-icon" id="sort" ></i>
             <i class="icon filter-icon" id="filter"></i>
diff --git a/packages/Webkul/User/src/Http/Controllers/AccountController.php b/packages/Webkul/User/src/Http/Controllers/AccountController.php
index dd9833542..f03279fbc 100755
--- a/packages/Webkul/User/src/Http/Controllers/AccountController.php
+++ b/packages/Webkul/User/src/Http/Controllers/AccountController.php
@@ -63,7 +63,7 @@ class AccountController extends Controller
         $data = request()->input();
 
         if (! Hash::check($data['current_password'], auth()->guard('admin')->user()->password)) {
-            session()->flash('warning', 'Current password does not match.');
+            session()->flash('warning', trans('admin::app.users.users.password-match'));
 
             return redirect()->back();
         }
@@ -75,7 +75,7 @@ class AccountController extends Controller
 
         $user->update($data);
 
-        session()->flash('success', 'Account changes saved successfully.');
+        session()->flash('success', trans('admin::app.users.users.account-save'));
 
         return back();
     }
diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php
index 0032c6a47..abd81bdf5 100755
--- a/packages/Webkul/User/src/Http/Controllers/SessionController.php
+++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php
@@ -72,13 +72,13 @@ class SessionController extends Controller
         $remember = request('remember');
 
         if (! auth()->guard('admin')->attempt(request(['email', 'password']), $remember)) {
-            session()->flash('error', 'Please check your credentials and try again.');
+            session()->flash('error', trans('admin::app.users.users.login-error'));
 
             return back();
         }
 
         if (auth()->guard('admin')->user()->status == 0) {
-            session()->flash('warning', 'Your account is yet to be activated, please contact administrator.');
+            session()->flash('warning', trans('admin::app.users.users.activate-warning'));
 
             auth()->guard('admin')->logout();
 
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index b2cc61fe6..73b531547 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -160,7 +160,7 @@ class UserController extends Controller
     public function destroy($id)
     {
         if ($this->admin->count() == 1) {
-            session()->flash('error', 'At least one admin is required.');
+            session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin']));
         } else {
             Event::fire('user.admin.delete.before', $id);