From 83735f3394973e19d1ef94aca6306e36e5855f1a Mon Sep 17 00:00:00 2001
From: Manish Verma <alerts@ladybirdweb.com>
Date: Mon, 13 Aug 2018 11:42:03 +0530
Subject: [PATCH] Updated language settings page

---
 .../Admin/helpdesk/LanguageController.php      | 18 +++++++++++++-----
 .../admin/helpdesk/language/index.blade.php    |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/helpdesk/LanguageController.php b/app/Http/Controllers/Admin/helpdesk/LanguageController.php
index b5f3e4ed5..b06448149 100644
--- a/app/Http/Controllers/Admin/helpdesk/LanguageController.php
+++ b/app/Http/Controllers/Admin/helpdesk/LanguageController.php
@@ -88,8 +88,16 @@ class LanguageController extends Controller
 
         return \Datatable::collection(new Collection($values))
                         ->addColumn('language', function ($model) {
+                            $img_src = 'lb-faveo/flags/' . $model . '.png';
                             if ($model == Config::get('app.fallback_locale')) {
-                                return Config::get('languages.'.$model)[1].' ('.Lang::get('lang.default').')';
+                                return '<img src="' . asset($img_src) . '"/>&nbsp;' . Config::get('languages.'.$model)[0].' ('.Lang::get('lang.default').')';
+                            } else {
+                                return '<img src="' . asset($img_src) . '"/>&nbsp;' . Config::get('languages.'.$model)[0];
+                            }
+                        })
+                        ->addColumn('name', function ($model) {
+                            if ($model == Config::get('app.fallback_locale')) {
+                                return Config::get('languages.'.$model)[1];
                             } else {
                                 return Config::get('languages.'.$model)[1];
                             }
@@ -99,17 +107,17 @@ class LanguageController extends Controller
                         })
                         ->addColumn('status', function ($model) use ($sysLanguage) {
                             if ($sysLanguage === $model) {
-                                return "<span style='color:green'>".Lang::trans('lang.active').'</span>';
+                                return "<span style='color:green'>".Lang::trans('lang.yes').'</span>';
                             } else {
-                                return "<span style='color:red'>".Lang::trans('lang.inactive').'</span>';
+                                return "<span style='color:red'>".Lang::trans('lang.no').'</span>';
                             }
                         })
                         ->addColumn('Action', function ($model) use ($sysLanguage) {
                             if ($model === $sysLanguage) {
-                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-info btn-xs btn-flat' disabled value='".Lang::trans('lang.disable')."'/></a>  
+                                return "<a href='change-language/".$model."' disabled><input type='button' class='btn btn-info btn-xs btn-flat' disabled value='".Lang::trans('lang.set_as_sys_lang')."'/></a>  
                 <a href='change-language/".$model."' class='btn btn-danger btn-xs btn-flat' disabled><i class='fa fa-trash' style='color:black;'> </i> ".Lang::trans('lang.delete').'</a>';
                             } else {
-                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-info btn-xs btn-flat' value='".Lang::trans('lang.enable')."'/></a>  
+                                return "<a href='change-language/".$model."'><input type='button' class='btn btn-info btn-xs btn-flat' value='".Lang::trans('lang.set_as_sys_lang')."'/></a>  
                 <a href='delete-language/".$model."' class='btn btn-danger btn-xs btn-flat'><i class='fa fa-trash' style='color:black;'> </i> ".Lang::trans('lang.delete').'</a>';
                             }
                         })
diff --git a/resources/views/themes/default1/admin/helpdesk/language/index.blade.php b/resources/views/themes/default1/admin/helpdesk/language/index.blade.php
index 040efc365..02c32b4cf 100644
--- a/resources/views/themes/default1/admin/helpdesk/language/index.blade.php
+++ b/resources/views/themes/default1/admin/helpdesk/language/index.blade.php
@@ -50,7 +50,7 @@ class="active"
         </div>
         @endif
         {!! Datatable::table()
-        ->addColumn(Lang::get('lang.language'),Lang::get('lang.iso-code'),Lang::get('lang.status'),Lang::get('lang.Action'))       // these are the column headings to be shown
+        ->addColumn(Lang::get('lang.language'),Lang::get('lang.native-name'),Lang::get('lang.iso-code'),Lang::get('lang.system-language'),Lang::get('lang.Action'))       // these are the column headings to be shown
         ->setUrl(route('getAllLanguages'))   // this is the route where data will be retrieved
         ->render()  !!}
     </div>