diff --git a/app/Model/MailJob/QueueService.php b/app/Model/MailJob/QueueService.php index c5455d155..1b6824e3c 100644 --- a/app/Model/MailJob/QueueService.php +++ b/app/Model/MailJob/QueueService.php @@ -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 = "Inactive"; + $html = "".Lang::get('lang.inactive').""; if ($status == 1) { - $html = "Active"; + $html = "".Lang::get('lang.active').""; } return $html; @@ -51,9 +52,9 @@ class QueueService extends Model { $id = $this->attributes['id']; $status = $this->attributes['status']; - $html = 'Activate"; + $html = '".Lang::get('lang.activate').""; if ($status == 1) { - $html = "Activate"; + $html = "".Lang::get('lang.activate').""; } return $html; diff --git a/database/migrations/2016_07_26_095020_create_queue_services_table.php b/database/migrations/2016_07_26_095020_create_queue_services_table.php index b7e4166e3..cf1037ab3 100644 --- a/database/migrations/2016_07_26_095020_create_queue_services_table.php +++ b/database/migrations/2016_07_26_095020_create_queue_services_table.php @@ -30,7 +30,7 @@ class CreateQueueServicesTable extends Migration 'status' => 0, ]); } - $q = $queue->where('short_name', 'database')->first(); + $q = $queue->where('short_name', 'sync')->first(); if ($q) { $q->status = 1; $q->save(); diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php index 99a6ef2e4..a4ce72420 100644 --- a/resources/lang/de/lang.php +++ b/resources/lang/de/lang.php @@ -27,7 +27,7 @@ return [ | Login Page |-------------------------------------- */ - 'Login_to_start_your_session' => 'Einloggen um Ihre Sitzung zu starten', + 'login_to_start_your_session' => 'Einloggen um Ihre Sitzung zu starten', 'login' => 'Login', 'remember' => 'Erinnere dich an mich', 'signmein' => 'Melde mich an', diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index cc4325c4e..1f50760d8 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -41,7 +41,7 @@ return [ | Login Page |-------------------------------------- */ - 'Login_to_start_your_session' => 'Login to start your session', + 'login_to_start_your_session' => 'Login to start your session', 'login' => 'Login', 'remember' => 'Remember me', 'signmein' => 'Sign me in', @@ -86,7 +86,7 @@ return [ 'activate_your_account_click_on_Link_that_send_to_your_mail' => 'Activate your account! Click on the link that we\'ve sent to your mail', 'activate_your_account_click_on_Link_that_send_to_your_mail_and_moble' => 'Activate your account! Click on the link that we\'ve sent to your mail or login to your account and enter the OTP code we\'ve sent on your mobile number', 'activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup' => 'Account created, please contact to system admin as we were unable to send OTP code to your mobile and email to your email address.', - 'this_field_do_not_match_our_records' => 'This field does not match our records.', + 'this_field_do_not_match_our_records' => ' does not match our records.', 'we_have_e-mailed_your_password_reset_link' => 'We have emailed your password reset link!', "we_can't_find_a_user_with_that_e-mail_address" => "We can't find a user with that email address.", /* @@ -1549,4 +1549,7 @@ return [ //login,registration 'enter_your_email_here'=>'Enter your email here', + /*********** Updated 3-12-2016 **********/ + 'activate' => 'Activate', + ]; diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index 0af8dd124..240f96658 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -52,7 +52,7 @@ return [ | Login Page |-------------------------------------- */ - 'Login_to_start_your_session' => 'Connectez-vous pour démarrer votre session ', + 'login_to_start_your_session' => 'Connectez-vous pour démarrer votre session ', 'login' => 'Identifiant', 'remember' => 'Se souvenir de moi', 'signmein' => 'Connexion', diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index de9c141d5..ff2567083 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -28,7 +28,7 @@ return [ | Login Page |-------------------------------------- */ - 'Login_to_start_your_session' => 'Login per incominciare la tua sessione', + 'login_to_start_your_session' => 'Login per incominciare la tua sessione', 'login' => 'Login', 'remember' => 'Ricordami', 'signmein' => 'Segnami', diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index 416cec1c5..b4c0bc03f 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -55,7 +55,7 @@ return [ | Login Page |-------------------------------------- */ - 'Login_to_start_your_session' => 'Log in om te beginnen', + 'login_to_start_your_session' => 'Log in om te beginnen', 'login' => 'Inloggen', 'remember' => 'Onthoud mij', 'signmein' => 'Inloggen', diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 2be3b32eb..62830dfe5 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -48,7 +48,7 @@ return [ |-------------------------------------- */ - 'Login_to_start_your_session' => 'Efetue o login para iniciar a sessão', + 'login_to_start_your_session' => 'Efetue o login para iniciar a sessão', 'login' => 'Login', 'remember' => 'Me lembrar', 'signmein' => 'Inscreva-se', diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index ef719a38e..7d24b446c 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -25,7 +25,7 @@ return [ | Login Page |-------------------------------------- */ - 'Login_to_start_your_session' => 'Авторизуйтесь, чтобы начать сеанс', + 'login_to_start_your_session' => 'Авторизуйтесь, чтобы начать сеанс', 'login' => 'Login', 'remember' => 'Запомнить меня', 'signmein' => 'Запишите меня в',