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:
@@ -3,6 +3,7 @@
|
|||||||
namespace App\Model\MailJob;
|
namespace App\Model\MailJob;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Lang;
|
||||||
|
|
||||||
class QueueService extends Model
|
class QueueService extends Model
|
||||||
{
|
{
|
||||||
@@ -39,9 +40,9 @@ class QueueService extends Model
|
|||||||
public function getStatus()
|
public function getStatus()
|
||||||
{
|
{
|
||||||
$status = $this->attributes['status'];
|
$status = $this->attributes['status'];
|
||||||
$html = "<span style='color:red'>Inactive</span>";
|
$html = "<span style='color:red'>".Lang::get('lang.inactive')."</span>";
|
||||||
if ($status == 1) {
|
if ($status == 1) {
|
||||||
$html = "<span style='color:green'>Active</span>";
|
$html = "<span style='color:green'>".Lang::get('lang.active')."</span>";
|
||||||
}
|
}
|
||||||
|
|
||||||
return $html;
|
return $html;
|
||||||
@@ -51,9 +52,9 @@ class QueueService extends Model
|
|||||||
{
|
{
|
||||||
$id = $this->attributes['id'];
|
$id = $this->attributes['id'];
|
||||||
$status = $this->attributes['status'];
|
$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) {
|
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;
|
return $html;
|
||||||
|
@@ -30,7 +30,7 @@ class CreateQueueServicesTable extends Migration
|
|||||||
'status' => 0,
|
'status' => 0,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
$q = $queue->where('short_name', 'database')->first();
|
$q = $queue->where('short_name', 'sync')->first();
|
||||||
if ($q) {
|
if ($q) {
|
||||||
$q->status = 1;
|
$q->status = 1;
|
||||||
$q->save();
|
$q->save();
|
||||||
|
@@ -27,7 +27,7 @@ return [
|
|||||||
| Login Page
|
| 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',
|
'login' => 'Login',
|
||||||
'remember' => 'Erinnere dich an mich',
|
'remember' => 'Erinnere dich an mich',
|
||||||
'signmein' => 'Melde mich an',
|
'signmein' => 'Melde mich an',
|
||||||
|
@@ -41,7 +41,7 @@ return [
|
|||||||
| Login Page
|
| Login Page
|
||||||
|--------------------------------------
|
|--------------------------------------
|
||||||
*/
|
*/
|
||||||
'Login_to_start_your_session' => 'Login to start your session',
|
'login_to_start_your_session' => 'Login to start your session',
|
||||||
'login' => 'Login',
|
'login' => 'Login',
|
||||||
'remember' => 'Remember me',
|
'remember' => 'Remember me',
|
||||||
'signmein' => 'Sign me in',
|
'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' => '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_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.',
|
'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_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.",
|
"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
|
//login,registration
|
||||||
'enter_your_email_here'=>'Enter your email here',
|
'enter_your_email_here'=>'Enter your email here',
|
||||||
|
|
||||||
|
/*********** Updated 3-12-2016 **********/
|
||||||
|
'activate' => 'Activate',
|
||||||
|
|
||||||
];
|
];
|
||||||
|
@@ -52,7 +52,7 @@ return [
|
|||||||
| Login Page
|
| 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',
|
'login' => 'Identifiant',
|
||||||
'remember' => 'Se souvenir de moi',
|
'remember' => 'Se souvenir de moi',
|
||||||
'signmein' => 'Connexion',
|
'signmein' => 'Connexion',
|
||||||
|
@@ -28,7 +28,7 @@ return [
|
|||||||
| Login Page
|
| 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',
|
'login' => 'Login',
|
||||||
'remember' => 'Ricordami',
|
'remember' => 'Ricordami',
|
||||||
'signmein' => 'Segnami',
|
'signmein' => 'Segnami',
|
||||||
|
@@ -55,7 +55,7 @@ return [
|
|||||||
| Login Page
|
| Login Page
|
||||||
|--------------------------------------
|
|--------------------------------------
|
||||||
*/
|
*/
|
||||||
'Login_to_start_your_session' => 'Log in om te beginnen',
|
'login_to_start_your_session' => 'Log in om te beginnen',
|
||||||
'login' => 'Inloggen',
|
'login' => 'Inloggen',
|
||||||
'remember' => 'Onthoud mij',
|
'remember' => 'Onthoud mij',
|
||||||
'signmein' => 'Inloggen',
|
'signmein' => 'Inloggen',
|
||||||
|
@@ -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',
|
'login' => 'Login',
|
||||||
'remember' => 'Me lembrar',
|
'remember' => 'Me lembrar',
|
||||||
'signmein' => 'Inscreva-se',
|
'signmein' => 'Inscreva-se',
|
||||||
|
@@ -25,7 +25,7 @@ return [
|
|||||||
| Login Page
|
| Login Page
|
||||||
|--------------------------------------
|
|--------------------------------------
|
||||||
*/
|
*/
|
||||||
'Login_to_start_your_session' => 'Авторизуйтесь, чтобы начать сеанс',
|
'login_to_start_your_session' => 'Авторизуйтесь, чтобы начать сеанс',
|
||||||
'login' => 'Login',
|
'login' => 'Login',
|
||||||
'remember' => 'Запомнить меня',
|
'remember' => 'Запомнить меня',
|
||||||
'signmein' => 'Запишите меня в',
|
'signmein' => 'Запишите меня в',
|
||||||
|
Reference in New Issue
Block a user