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

Bug-fix-patch-8

Browse Source 
# 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
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Model/MailJob/QueueService.php
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;

2
database/migrations/2016_07_26_095020_create_queue_services_table.php
View File

@@ -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();

2
resources/lang/de/lang.php
View File

@@ -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',

7
resources/lang/en/lang.php
View File

@@ -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',
];

2
resources/lang/fr/lang.php
View File

@@ -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',

2
resources/lang/it/lang.php
View File

@@ -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',

2
resources/lang/nl/lang.php
View File

@@ -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',

2
resources/lang/pt/lang.php
View File

@@ -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',

2
resources/lang/ru/lang.php
View File

@@ -25,7 +25,7 @@ return [
| Login Page
|--------------------------------------
*/
'Login_to_start_your_session' => 'Авторизуйтесь, чтобы начать сеанс',
'login_to_start_your_session' => 'Авторизуйтесь, чтобы начать сеанс',
'login' => 'Login',
'remember' => 'Запомнить меня',
'signmein' => 'Запишите меня в',