Merge pull request #4594 from ladybirdweb/analysis-gOQwr6
Apply fixes from StyleCI
This commit is contained in:
@@ -2790,7 +2790,7 @@ class TicketController extends Controller
|
||||
})
|
||||
->editColumn('a_uname', function ($tickets) {
|
||||
if ($tickets->assigned_to == null && $tickets->name == null) {
|
||||
return "<span style='color:red'>".Lang::get('lang.Unassigned')."</span>";
|
||||
return "<span style='color:red'>".Lang::get('lang.Unassigned').'</span>';
|
||||
} else {
|
||||
$assign = $tickets->assign_user_name;
|
||||
if ($tickets->assigned_to != null) {
|
||||
@@ -3215,7 +3215,7 @@ class TicketController extends Controller
|
||||
})
|
||||
->addColumn('assign_user_name', function ($tickets) {
|
||||
if ($tickets->assigned_to == null) {
|
||||
return "<span style='color:red'>".Lang::get('lang.Unassigned')."</span>";
|
||||
return "<span style='color:red'>".Lang::get('lang.Unassigned').'</span>';
|
||||
} else {
|
||||
$assign = $tickets->assign_user_name;
|
||||
$url = route('user.show', $tickets->assigned_to);
|
||||
|
@@ -117,9 +117,9 @@ $bootstrapPermission = substr(sprintf('%o', fileperms($basePath.DIRECTORY_SEPARA
|
||||
<?php
|
||||
echo '<tr>';
|
||||
if (version_compare(phpversion(), '7.1') == -1 || version_compare('7.1.50', phpversion()) == -1) {
|
||||
echo "<td>PHP Version</td> <td style='color:red'>".phpversion().'<p>Recommended PHP version 7.1</p></td>';
|
||||
echo "<td>PHP Version</td> <td style='color:red'>".phpversion().'<p>Recommended PHP version 7.1</p></td>';
|
||||
} else {
|
||||
echo "<td>PHP Version</td> <td style='color:green'>".phpversion().'</td>';
|
||||
echo "<td>PHP Version</td> <td style='color:green'>".phpversion().'</td>';
|
||||
}
|
||||
echo '</tr>';
|
||||
echo '<tr>';
|
||||
|
@@ -1,25 +1,25 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
"sEmptyTable" => "No data available in table",
|
||||
"sInfo" => "Showing _START_ to _END_ of _TOTAL_ entries",
|
||||
"sInfoEmpty" => "Showing 0 to 0 of 0 entries",
|
||||
"sInfoFiltered" => "(filtered from _MAX_ total entries)",
|
||||
"sInfoPostFix" => "",
|
||||
"sInfoThousands" => ",",
|
||||
"sLengthMenu" => "_MENU_ Records per page",
|
||||
"sLoadingRecords" => "Loading...",
|
||||
"sProcessing" => "Processing...",
|
||||
"sSearch" => "Search:",
|
||||
"sZeroRecords" => "No matching records found",
|
||||
"oPaginate" => [
|
||||
"sFirst" => "First",
|
||||
"sLast" => "Last",
|
||||
"sNext" => "Next",
|
||||
"sPrevious" => "Previous",
|
||||
'sEmptyTable' => 'No data available in table',
|
||||
'sInfo' => 'Showing _START_ to _END_ of _TOTAL_ entries',
|
||||
'sInfoEmpty' => 'Showing 0 to 0 of 0 entries',
|
||||
'sInfoFiltered' => '(filtered from _MAX_ total entries)',
|
||||
'sInfoPostFix' => '',
|
||||
'sInfoThousands' => ',',
|
||||
'sLengthMenu' => '_MENU_ Records per page',
|
||||
'sLoadingRecords' => 'Loading...',
|
||||
'sProcessing' => 'Processing...',
|
||||
'sSearch' => 'Search:',
|
||||
'sZeroRecords' => 'No matching records found',
|
||||
'oPaginate' => [
|
||||
'sFirst' => 'First',
|
||||
'sLast' => 'Last',
|
||||
'sNext' => 'Next',
|
||||
'sPrevious' => 'Previous',
|
||||
],
|
||||
"oAria" => [
|
||||
"sSortAscending" => ": activate to sort column ascending",
|
||||
"sSortDescending" => ": activate to sort column descending"
|
||||
'oAria' => [
|
||||
'sSortAscending' => ': activate to sort column ascending',
|
||||
'sSortDescending' => ': activate to sort column descending',
|
||||
],
|
||||
];
|
||||
];
|
||||
|
@@ -1,25 +1,25 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
"sEmptyTable" => "В таблице отсутствуют данные",
|
||||
"sInfo" => "Записи с _START_ до _END_ из _TOTAL_ записей",
|
||||
"sInfoEmpty" => "Записи с 0 до 0 из 0 записей",
|
||||
"sInfoFiltered" => "(отфильтровано из _MAX_ записей)",
|
||||
"sInfoPostFix" => "",
|
||||
"sInfoThousands" => ",",
|
||||
"sLengthMenu" => "_MENU_ Записей на странице",
|
||||
"sLoadingRecords" => "Загрузка записей...",
|
||||
"sProcessing" => "Подождите...",
|
||||
"sSearch" => "Поиск:",
|
||||
"sZeroRecords" => "Записи отсутствуют.",
|
||||
"oPaginate" => [
|
||||
"sFirst" => "Первая",
|
||||
"sPrevious" => "Предыдущая",
|
||||
"sNext" => "Следующая",
|
||||
"sLast" => "Последняя"
|
||||
'sEmptyTable' => 'В таблице отсутствуют данные',
|
||||
'sInfo' => 'Записи с _START_ до _END_ из _TOTAL_ записей',
|
||||
'sInfoEmpty' => 'Записи с 0 до 0 из 0 записей',
|
||||
'sInfoFiltered' => '(отфильтровано из _MAX_ записей)',
|
||||
'sInfoPostFix' => '',
|
||||
'sInfoThousands' => ',',
|
||||
'sLengthMenu' => '_MENU_ Записей на странице',
|
||||
'sLoadingRecords' => 'Загрузка записей...',
|
||||
'sProcessing' => 'Подождите...',
|
||||
'sSearch' => 'Поиск:',
|
||||
'sZeroRecords' => 'Записи отсутствуют.',
|
||||
'oPaginate' => [
|
||||
'sFirst' => 'Первая',
|
||||
'sPrevious' => 'Предыдущая',
|
||||
'sNext' => 'Следующая',
|
||||
'sLast' => 'Последняя',
|
||||
],
|
||||
"oAria" => [
|
||||
"sSortAscending" => ": активировать для сортировки столбца по возрастанию",
|
||||
"sSortDescending" => ": активировать для сортировки столбца по убыванию"
|
||||
'oAria' => [
|
||||
'sSortAscending' => ': активировать для сортировки столбца по возрастанию',
|
||||
'sSortDescending' => ': активировать для сортировки столбца по убыванию',
|
||||
],
|
||||
];
|
||||
];
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -2,6 +2,6 @@
|
||||
|
||||
return [
|
||||
'success' => 'Успех',
|
||||
'failed' => 'Ошибка',
|
||||
'alert' => 'Тревога',
|
||||
];
|
||||
'failed' => 'Ошибка',
|
||||
'alert' => 'Тревога',
|
||||
];
|
||||
|
Reference in New Issue
Block a user