tomhatzer · tomhatzer · Feb 27, 2016 · Feb 23, 2016 · Feb 23, 2016
diff --git a/src/Controllers/QuickadminMenuController.php b/src/Controllers/QuickadminMenuController.php
@@ -348,7 +348,7 @@ public function update(Request $request, $id)
             }
         }
         $requestArray = $request->all();
-        if ( ! isset($requestArray['parent_id'])) {
+        if (!isset($requestArray['parent_id'])) {
             $requestArray['parent_id'] = null;
         }
         $requestArray['roles'] = $rolesInsert;
@@ -357,4 +357,4 @@ public function update(Request $request, $id)
 
         return redirect()->route('menu');
     }
-}
+}
diff --git a/src/Controllers/publish/UsersController b/src/Controllers/publish/UsersController
@@ -44,7 +44,7 @@ class UsersController extends Controller
         $input['password'] = Hash::make($input['password']);
         $user = User::create($input);
 
-        return redirect()->route('users.index')->withMessage('User was successfully created!');
+        return redirect()->route('users.index')->withMessage(trans('quickadmin::admin.users-controller-successfully_created'));
     }
 
     /**
@@ -77,7 +77,7 @@ class UsersController extends Controller
         $input['password'] = Hash::make($input['password']);
         $user->update($input);
 
-        return redirect()->route('users.index')->withMessage('User was successfully updated!');
+        return redirect()->route('users.index')->withMessage(trans('quickadmin::admin.users-controller-successfully_updated'));
     }
 
     /**
@@ -92,6 +92,6 @@ class UsersController extends Controller
         $user = User::findOrFail($id);
         User::destroy($id);
 
-        return redirect()->route('users.index')->withMessage('User was successfully deleted!');
+        return redirect()->route('users.index')->withMessage(trans('quickadmin::admin.users-controller-successfully_deleted'));
     }
 }
diff --git a/src/Fields/FieldsDescriber.php b/src/Fields/FieldsDescriber.php
@@ -33,9 +33,9 @@ public static function types()
     public static function validation()
     {
         return [
-            'optional'        => 'Optional',
-            'required'        => 'Required',
-            'required|unique' => 'Required unique'
+            'optional'        => trans('quickadmin::strings.optional'),
+            'required'        => trans('quickadmin::strings.required'),
+            'required|unique' => trans('quickadmin::strings.required_unique')
         ];
     }
 
@@ -80,8 +80,8 @@ public static function migration()
     public static function default_cbox()
     {
         return [
-            'false' => 'Default unchecked',
-            'true'  => 'Default checked'
+            'false' => trans('quickadmin::strings.default_unchecked'),
+            'true'  => trans('quickadmin::strings.default_checked'),
         ];
     }
 }
diff --git a/src/QuickadminServiceProvider.php b/src/QuickadminServiceProvider.php
@@ -16,6 +16,8 @@ class QuickadminServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        // Register vendor translations
+        $this->loadTranslationsFrom(__DIR__ . DIRECTORY_SEPARATOR . 'Translations' . DIRECTORY_SEPARATOR , 'quickadmin');
         // Register vendor views
         $this->loadViewsFrom(__DIR__ . DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR . 'qa', 'qa');
         $this->loadViewsFrom(__DIR__ . DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR . 'templates', 'tpl');
@@ -25,6 +27,7 @@ public function boot()
             __DIR__ . DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR . 'admin'                                                      => base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'admin'),
             __DIR__ . DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR . 'auth'                                                       => base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'auth'),
             __DIR__ . DIRECTORY_SEPARATOR . 'Views' . DIRECTORY_SEPARATOR . 'emails'                                                     => base_path('resources' . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'emails'),
+            __DIR__ . DIRECTORY_SEPARATOR . 'Translations'                                                                               => base_path('resources' . DIRECTORY_SEPARATOR . 'lang'  . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'laraveldaily'),
             __DIR__ . DIRECTORY_SEPARATOR . 'Public' . DIRECTORY_SEPARATOR . 'quickadmin'                                                => base_path('public' . DIRECTORY_SEPARATOR . 'quickadmin'),
             __DIR__ . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'publish' . DIRECTORY_SEPARATOR . 'UsersController'    => app_path('Http' . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'UsersController.php'),
             __DIR__ . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'publish' . DIRECTORY_SEPARATOR . 'Controller'         => app_path('Http' . DIRECTORY_SEPARATOR . 'Controllers' . DIRECTORY_SEPARATOR . 'Controller.php'),
@@ -75,4 +78,4 @@ public function register()
         $loader->alias('Datatables', 'yajra\Datatables\Datatables');
     }
 
-}
+}
diff --git a/src/Templates/customView_index b/src/Templates/customView_index
@@ -4,10 +4,10 @@
 
     <div class="portlet box green">
         <div class="portlet-title">
-            <div class="caption">List</div>
+            <div class="caption">{{ trans('quickadmin::templates.templates-customView_index-list') }}</div>
         </div>
         <div class="portlet-body">
-            Welcome to your custom view
+            {{ trans('quickadmin::templates.templates-customView_index-welcome_custom_view') }}
         </div>
 	</div>
 

diff --git a/src/Templates/view_create b/src/Templates/view_create
@@ -4,7 +4,7 @@
 
 <div class="row">
     <div class="col-md-10 col-md-offset-2">
-        <h1Add new</h1>
+        <h1>{{ trans('quickadmin::templates.templates-view_create-add_new') }}</h1>
 
         @if ($errors->any())
         	<div class="alert alert-danger">
@@ -23,7 +23,7 @@ $FORMFIELDS$
 <div class="form-group">
     <label class="col-sm-2 control-label">&nbsp;</label>
     <div class="col-sm-10">
-      {!! Form::submit('Create', array('class' => 'btn btn-primary')) !!}
+      {!! Form::submit( trans('quickadmin::templates.templates-view_create-create') , array('class' => 'btn btn-primary')) !!}
     </div>
 </div>
 

diff --git a/src/Templates/view_edit b/src/Templates/view_edit
@@ -4,7 +4,7 @@
 
 <div class="row">
     <div class="col-md-10 col-md-offset-2">
-        <h1>Edit</h1>
+        <h1>{{ trans('quickadmin::templates.templates-view_edit-edit') }}</h1>
 
         @if ($errors->any())
         	<div class="alert alert-danger">
@@ -23,8 +23,8 @@ $FORMFIELDS$
 <div class="form-group">
     <label class="col-sm-2 control-label">&nbsp;</label>
     <div class="col-sm-10">
-      {!! Form::submit('Update', array('class' => 'btn btn-primary')) !!}
-      {!! link_to_route('admin.$ROUTE$.index', 'Cancel', $$RESOURCE$->id, array('class' => 'btn btn-default')) !!}
+      {!! Form::submit(trans('quickadmin::templates.templates-view_edit-update'), array('class' => 'btn btn-primary')) !!}
+      {!! link_to_route('admin.$ROUTE$.index', trans('quickadmin::templates.templates-view_edit-cancel'), $$RESOURCE$->id, array('class' => 'btn btn-default')) !!}
     </div>
 </div>
 

diff --git a/src/Templates/view_index b/src/Templates/view_index
@@ -2,15 +2,15 @@
 
 @section('content')
 
-<p>{!! link_to_route('admin.$ROUTE$.create', 'Add new', null, array('class' => 'btn btn-success')) !!}</p>
+<p>{!! link_to_route('admin.$ROUTE$.create', trans('quickadmin::templates.templates-view_index-add_new') , null, array('class' => 'btn btn-success')) !!}</p>
 
 @if ($$RESOURCE$->count())
     <div class="portlet box green">
         <div class="portlet-title">
-            <div class="caption">List</div>
+            <div class="caption">{{ trans('quickadmin::templates.templates-view_index-list') }}</div>
         </div>
         <div class="portlet-body">
-            <table class="table table-striped table-hover table-responsive datatable">
+            <table class="table table-striped table-hover table-responsive datatable" id="datatable">
                 <thead>
                     <tr>
                         <th>
@@ -29,9 +29,9 @@
                             </td>
                             $FIELDS$
                             <td>
-                                {!! link_to_route('admin.$ROUTE$.edit', 'Edit', array($row->id), array('class' => 'btn btn-xs btn-info')) !!}
-                                {!! Form::open(array('style' => 'display: inline-block;', 'method' => 'DELETE', 'onsubmit' => 'return confirm(\'Confirm deletion\');',  'route' => array('admin.$ROUTE$.destroy', $row->id))) !!}
-                                    {!! Form::submit('Delete', array('class' => 'btn btn-xs btn-danger')) !!}
+                                {!! link_to_route('admin.$ROUTE$.edit', trans('quickadmin::templates.templates-view_index-edit'), array($row->id), array('class' => 'btn btn-xs btn-info')) !!}
+                                {!! Form::open(array('style' => 'display: inline-block;', 'method' => 'DELETE', 'onsubmit' => "return confirm('".trans("quickadmin::templates.templates-view_index-confirm_deletion")."');",  'route' => array('admin.$ROUTE$.destroy', $row->id))) !!}
+                                {!! Form::submit(trans('quickadmin::templates.templates-view_index-delete'), array('class' => 'btn btn-xs btn-danger')) !!}
                                 {!! Form::close() !!}
                             </td>
                         </tr>
@@ -41,7 +41,7 @@
             <div class="row">
                 <div class="col-xs-12">
                     <button class="btn btn-danger" id="delete">
-                        Delete checked
+                        {{ trans('quickadmin::templates.templates-view_index-delete_checked') }}
                     </button>
                 </div>
             </div>
@@ -51,7 +51,7 @@
         </div>
 	</div>
 @else
-    No entries found.
+    {{ trans('quickadmin::templates.templates-view_index-no_entries_found') }}
 @endif
 
 @endsection
@@ -60,7 +60,7 @@
     <script>
         $(document).ready(function () {
             $('#delete').click(function () {
-                if (window.confirm("Are you sure?")) {
+                if (window.confirm('{{ trans('quickadmin::templates.templates-view_index-are_you_sure') }}')) {
                     var send = $('#send');
                     var mass = $('.mass').is(":checked");
                     if (mass == true) {

diff --git a/src/Translations/en/admin.php b/src/Translations/en/admin.php
@@ -0,0 +1,55 @@
+<?php
+return [
+
+  // dashboard
+  'dashboard-title' => 'Welcome to your project dashboard',
+
+  // partials-header
+  'partials-header-title' => 'QuickAdmin en',
+
+  // partials-sidebar
+  'partials-sidebar-menu' => 'Menu',
+  'partials-sidebar-users' => 'Users',
+  'partials-sidebar-user-actions' => 'User actions',
+  'partials-sidebar-logout' => 'Logout',
+
+  // partials-topbar
+  'partials-topbar-title' => 'QuickAdmin en',
+
+  // users-create
+  'users-create-create_user' => 'Create user',
+  'users-create-name' => 'Name',
+  'users-create-name_placeholder' => 'Name',
+  'users-create-email' => 'Email',
+  'users-create-email_placeholder' => 'Email',
+  'users-create-password' => 'Password',
+  'users-create-password_placeholder' => 'Password',
+  'users-create-role' => 'Role',
+  'users-create-btncreate' => 'Create',
+
+  // users-create
+  'users-edit-edit_user' => 'Edit user',
+  'users-edit-name' => 'Name',
+  'users-edit-name_placeholder' => 'Name',
+  'users-edit-email' => 'Email',
+  'users-edit-email_placeholder' => 'Email',
+  'users-edit-password' => 'Password',
+  'users-edit-password_placeholder' => 'Password',
+  'users-edit-role' => 'Role',
+  'users-edit-btnupdate' => 'Update',
+
+  // users-index
+  'users-index-add_new' => 'Add new',  
+  'users-index-users_list' => 'Users list',
+  'users-index-name' => 'Name',
+  'users-index-edit' => 'Edit',
+  'users-index-delete' => 'Delete',
+  'users-index-are_you_sure' => 'Are you sure?',
+  'users-index-no_entries_found' => 'No entries found',
+
+  // users-controller
+  'users-controller-successfully_created' => 'User was successfully created!',
+  'users-controller-successfully_updated' => 'User was successfully updated!',  
+  'users-controller-successfully_deleted' => 'User was successfully deleted!',
+
+];
diff --git a/src/Translations/en/auth.php b/src/Translations/en/auth.php
@@ -0,0 +1,27 @@
+<?php
+return [
+
+  // generic   
+  'whoops'  => 'Oops !',
+  'some_problems_with_input' => 'there are some problems with input!',
+
+  // auth-login
+  'login-login' => 'Login',
+  'login-email' => 'Email',
+  'login-password' => 'Password',
+  'login-remember_me' => 'Remember Me',
+  'login-btnlogin' => 'Log In',
+
+  // auth-password
+  'password-reset_password' => 'Reset password',
+  'password-email' => 'Email',
+  'password-btnsend_password' => 'Send Password Reset Link',
+
+  // auth-reset
+  'reset-reset_password' => 'Reset password',
+  'reset-email' => 'Email',
+  'reset-password' => 'Password',  
+  'reset-confirm_password' => 'Confirm password',  
+  'reset-btnreset_password' => 'Reset password',
+
+];
diff --git a/src/Translations/en/emails.php b/src/Translations/en/emails.php
@@ -0,0 +1,7 @@
+<?php
+return [
+
+  // emails-password
+  'password-reset_your_password' => 'Click here to reset your password:',
+
+];
diff --git a/src/Translations/en/qa.php b/src/Translations/en/qa.php
@@ -0,0 +1,70 @@
+<?php
+return [
+
+  // logs-index
+  'logs-index-list' => 'List',
+  'logs-index-user' => 'User',
+  'logs-index-action' => 'Action',
+  'logs-index-action_model' => 'Action model',
+  'logs-index-action_id' => 'Action id',
+  'logs-index-time' => 'Time',
+
+  // menus-createCrud
+  'menus-createCrud-create_new_crud' => 'Create new CRUD menu item',
+  'menus-createCrud-crud_parent' => 'CRUD parent',
+  'menus-createCrud-crud_name' => 'CRUD name',
+  'menus-createCrud-crud_name_placeholder' => 'ex. Books or Products (used to generate DB table and all back-end files)',
+  'menus-createCrud-crud_title' => 'CRUD title',
+  'menus-createCrud-crud_title_placeholder' => 'Menu title (used for menu item)',
+  'menus-createCrud-roles' => 'Roles',
+  'menus-createCrud-soft_delete' => 'Use soft delete?',
+  'menus-createCrud-icon' => 'Icon (font-awesome)',
+  'menus-createCrud-icon_placeholder' => 'Font awesome',
+  'menus-createCrud-add_fields' => 'Add fields',
+  'menus-createCrud-show_in_list' => 'Show in list',
+  'menus-createCrud-create_crud' => 'Create CRUD',
+  'menus-createCrud-add_field' => 'Add one more field',
+  'menus-createCrud-select_display_field' => 'Select display field',
+
+  // menus-createCustom
+  'menus-createCustom-create_new_custom_controller' => 'Create new custom controller',
+  'menus-createCustom-menu_parent' => 'Menu parent',
+  'menus-createCustom-controller_name' => 'Controller name',
+  'menus-createCustom-controller_name_placeholder' => 'ex. Books or Products (used to generate DB table and all back-end files)',
+  'menus-createCustom-menu_title' =>  'Menu title',
+  'menus-createCustom-menu_title_placeholder' => 'Menu title (used for menu item)',
+  'menus-createCustom-roles' => 'Roles',
+  'menus-createCustom-icon' => 'Icon (font-awesome)',
+  'menus-createCustom-icon_placeholder' =>  'Font awesome',
+  'menus-createCustom-create_controller' => 'Create controller',
+
+  // menus-createParent
+  'menus-createParent-create_new_parent' => 'Create new parent menu item',
+  'menus-createParent-parent_title' => 'Parent title',
+  'menus-createParent-parent_title_placeholder' =>  'Menu title (used for menu item)',
+  'menus-createParent-roles' => 'Roles',
+  'menus-createParent-icon' => 'Icon (font-awesome)',
+  'menus-createParent-icon_placeholder' => 'Font awesome',
+  'menus-createParent-create_parent' => 'Create parent',
+
+  // menus-edit
+  'menus-edit-edit_menu_information' => 'Edit menu information',
+  'menus-edit-parent' => 'Parent',
+  'menus-edit-title' => 'Title',
+  'menus-edit-title_placeholder' => 'Menu title (used for menu item)',
+  'menus-edit-roles' => 'Roles',
+  'menus-edit-icon' => 'Icon (font-awesome)',
+  'menus-edit-icon_placeholder' => 'Font awesome',  
+  'menus-edit-update' => 'Update',
+
+
+  // menus-index
+  'menus-index-no_menu_items_found' => 'No menu items found',
+  'menus-index-new_crud' => 'Create new CRUD Controller',
+  'menus-index-new_custom' => 'Create new Custom Controller',
+  'menus-index-new_parent' => 'Create new Parent Menu Item',
+  'menus-index-positions_drag_drop' => 'You can change menu positions with drag-drop',
+  'menus-index-click_save_positions' => 'Changes will be saved when you click Save positions',
+  'menus-index-save_positions' => 'Save positions',
+
+];
diff --git a/src/Translations/en/strings.php b/src/Translations/en/strings.php
@@ -0,0 +1,19 @@
+<?php
+return [
+
+  /*
+    Datatables Internationalisation - Available translations
+      https://www.datatables.net/plug-ins/i18n/
+  */
+  'datatable_url_language' => '//cdn.datatables.net/plug-ins/1.10.11/i18n/English.json',
+
+  // strings
+  'yes' => 'Yes',
+  'no' => 'No',
+  'optional' => 'Optional',
+  'required' => 'Required',
+  'required_unique' => 'Required unique',
+  'default_unchecked' => 'Default unchecked',
+  'default_checked' => 'Default checked'  
+
+];