Bug-fix-patch-8

# updates for language translaion
# corrected login page translation
# queue setting page translation
# Actiaved 'Sync'  queue service by default while installing
This commit is contained in:
Manish Verma
2016-12-03 15:45:29 +05:30
parent 18335dd084
commit 91f37695c4
9 changed files with 17 additions and 13 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
use Lang;
class QueueService extends Model
{
@@ -39,9 +40,9 @@ class QueueService extends Model
public function getStatus()
{
$status = $this->attributes['status'];
$html = "<span style='color:red'>Inactive</span>";
$html = "<span style='color:red'>".Lang::get('lang.inactive')."</span>";
if ($status == 1) {
$html = "<span style='color:green'>Active</span>";
$html = "<span style='color:green'>".Lang::get('lang.active')."</span>";
}
return $html;
@@ -51,9 +52,9 @@ class QueueService extends Model
{
$id = $this->attributes['id'];
$status = $this->attributes['status'];
$html = '<a href='.url('queue/'.$id.'/activate')." class='btn btn-primary'>Activate</a>";
$html = '<a href='.url('queue/'.$id.'/activate')." class='btn btn-primary'>".Lang::get('lang.activate')."</a>";
if ($status == 1) {
$html = "<a href='#' class='btn btn-primary' disabled>Activate</a>";
$html = "<a href='#' class='btn btn-primary' disabled>".Lang::get('lang.activate')."</a>";
}
return $html;