cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #647 from ladybirdweb/analysis-qyjBB2

Browse Source 
Apply fixes from StyleCI
This commit is contained in:
Bhanu
2018-08-08 15:44:32 +05:30
committed by GitHub
parent 3b76605892 4cc8353760
commit 035bc5a069
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/helpdesk/LanguageController.php
View File

@@ -85,6 +85,7 @@ class LanguageController extends Controller
$values = scandir($path); //Extracts names of directories present in lang directory $values = scandir($path); //Extracts names of directories present in lang directory
$values = array_slice($values, 2); // skips array element $value[0] = '.' & $value[1] = '..' $values = array_slice($values, 2); // skips array element $value[0] = '.' & $value[1] = '..'
$sysLanguage = \Cache::get('language'); $sysLanguage = \Cache::get('language');
return \Datatable::collection(new Collection($values)) return \Datatable::collection(new Collection($values))
->addColumn('language', function ($model) { ->addColumn('language', function ($model) {
if ($model == Config::get('app.fallback_locale')) { if ($model == Config::get('app.fallback_locale')) {
@@ -96,7 +97,7 @@ class LanguageController extends Controller
->addColumn('id', function ($model) { ->addColumn('id', function ($model) {
return $model; return $model;
}) })
->addColumn('status', function ($model) use ($sysLanguage){ ->addColumn('status', function ($model) use ($sysLanguage) {
if ($sysLanguage === $model) { if ($sysLanguage === $model) {
return "<span style='color:green'>".Lang::trans('lang.active').'</span>'; return "<span style='color:green'>".Lang::trans('lang.active').'</span>';
} else { } else {

2
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -418,7 +418,7 @@ class UnAuthController extends Controller
} }
/** /**
* Function to chnage user language preference * Function to chnage user language preference.
* *
* @param string $lang //desired language's iso code * @param string $lang //desired language's iso code
* *

4
database/migrations/2018_08_08_094653_alter_users_table_add_user_language_column.php
View File

@@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AlterUsersTableAddUserLanguageColumn extends Migration class AlterUsersTableAddUserLanguageColumn extends Migration
{ {