From a151e68111e5228866cd71ea4bfafa12e19dc835 Mon Sep 17 00:00:00 2001 From: "rafael.sisweb" Date: Fri, 20 Nov 2015 06:04:00 -0500 Subject: [PATCH 1/2] New string to pt_BR --- resources/lang/pt_BR/passwords.php | 22 ++++++++++++++++++++++ resources/lang/pt_BR/texts.php | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 resources/lang/pt_BR/passwords.php diff --git a/resources/lang/pt_BR/passwords.php b/resources/lang/pt_BR/passwords.php new file mode 100644 index 000000000000..bd575ee830e7 --- /dev/null +++ b/resources/lang/pt_BR/passwords.php @@ -0,0 +1,22 @@ + "Senhas deve conter pelo menos seis caracteres e combinar com a confirmação.", + "user" => "Usuário não encontrado.", + "token" => "Token inválido.", + "sent" => "Link para reset da senha enviado por email!", + "reset" => "Senha resetada!", + +]; diff --git a/resources/lang/pt_BR/texts.php b/resources/lang/pt_BR/texts.php index 0bd495921e83..d673bc6b9c08 100644 --- a/resources/lang/pt_BR/texts.php +++ b/resources/lang/pt_BR/texts.php @@ -919,5 +919,6 @@ return array( 'user_unconfirmed' => 'Confirme sua conta para enviar e-mails', 'invalid_contact_email' => 'E-mail do contato inválido', ] - + + 'client_portal' => 'Portal do Cliente', ); From 5888fdf12a78287f089d49d8458e9be8d7c81166 Mon Sep 17 00:00:00 2001 From: "rafael.sisweb" Date: Tue, 24 Nov 2015 06:59:30 -0500 Subject: [PATCH 2/2] Missing action header on datatables --- app/Http/Controllers/ClientController.php | 11 ++++++++++- app/Http/Controllers/CreditController.php | 10 +++++++++- app/Http/Controllers/InvoiceController.php | 2 +- app/Http/Controllers/PaymentController.php | 11 ++++++++++- app/Http/Controllers/TaskController.php | 10 +++++++++- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 124d7bc574d1..6504d54ed90f 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -52,7 +52,16 @@ class ClientController extends BaseController 'entityType' => ENTITY_CLIENT, 'title' => trans('texts.clients'), 'sortCol' => '4', - 'columns' => Utils::trans(['checkbox', 'client', 'contact', 'email', 'date_created', 'last_login', 'balance', '']), + 'columns' => Utils::trans([ + 'checkbox', + 'client', + 'contact', + 'email', + 'date_created', + 'last_login', + 'balance', + 'action' + ]), )); } diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index c3e3068c43bb..e2d5ad78c554 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -37,7 +37,15 @@ class CreditController extends BaseController 'entityType' => ENTITY_CREDIT, 'title' => trans('texts.credits'), 'sortCol' => '4', - 'columns' => Utils::trans(['checkbox', 'client', 'credit_amount', 'credit_balance', 'credit_date', 'private_notes', '']), + 'columns' => Utils::trans([ + 'checkbox', + 'client', + 'credit_amount', + 'credit_balance', + 'credit_date', + 'private_notes', + 'action' + ]), )); } diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 73006f39bab1..ea870d0f411d 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -69,7 +69,7 @@ class InvoiceController extends BaseController 'balance_due', 'due_date', 'status', - '' + 'action' ]), ]; diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 3b9f1269a124..1c881384ceb0 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -46,7 +46,16 @@ class PaymentController extends BaseController return View::make('list', array( 'entityType' => ENTITY_PAYMENT, 'title' => trans('texts.payments'), - 'columns' => Utils::trans(['checkbox', 'invoice', 'client', 'transaction_reference', 'method', 'payment_amount', 'payment_date', '']), + 'columns' => Utils::trans([ + 'checkbox', + 'invoice', + 'client', + 'transaction_reference', + 'method', + 'payment_amount', + 'payment_date', + 'action' + ]), )); } diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index efd8f05bc680..3d4ab08935fe 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -43,7 +43,15 @@ class TaskController extends BaseController 'entityType' => ENTITY_TASK, 'title' => trans('texts.tasks'), 'sortCol' => '2', - 'columns' => Utils::trans(['checkbox', 'client', 'date', 'duration', 'description', 'status', '']), + 'columns' => Utils::trans([ + 'checkbox', + 'client', + 'date', + 'duration', + 'description', + 'status', + 'action' + ]), )); }