From 474cf929e69d9c3406fd9d34ed40c18c0515959e Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 25 Jun 2018 10:46:37 +0300 Subject: [PATCH 1/2] fixed #391 --- app/Http/Controllers/Expenses/Bills.php | 4 ++-- app/Http/Controllers/Incomes/Invoices.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 40e27405d..08186e8ef 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -509,14 +509,14 @@ class Bills extends Controller $excel->sheet('invoices', function($sheet) use ($bills) { $sheet->fromModel($bills->makeHidden([ - 'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'payments', 'totals', 'media' + 'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'histories', 'payments', 'totals', 'media' ])); }); $tables = ['items', 'histories', 'payments', 'totals']; foreach ($tables as $table) { $excel->sheet('bill_' . $table, function($sheet) use ($bills, $table) { - $hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at']; + $hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at', 'title']; $i = 1; foreach ($bills as $bill) { diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index f0b7b3346..85ca80ba4 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -530,14 +530,14 @@ class Invoices extends Controller $excel->sheet('invoices', function($sheet) use ($invoices) { $sheet->fromModel($invoices->makeHidden([ - 'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'payments', 'totals', 'media' + 'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'histories', 'payments', 'totals', 'media' ])); }); $tables = ['items', 'histories', 'payments', 'totals']; foreach ($tables as $table) { $excel->sheet('invoice_' . $table, function($sheet) use ($invoices, $table) { - $hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at']; + $hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at', 'title']; $i = 1; foreach ($invoices as $invoice) { From b1d258644c7a246d8d8440e4ecf95ea5cf36c066 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 25 Jun 2018 10:49:36 +0300 Subject: [PATCH 2/2] updated translations --- resources/lang/es-MX/auth.php | 14 +++++++------- resources/lang/es-MX/general.php | 6 +++--- resources/lang/es-MX/import.php | 2 +- resources/lang/es-MX/messages.php | 4 ++-- resources/lang/es-MX/modules.php | 8 ++++---- resources/lang/es-MX/transfers.php | 2 +- resources/lang/pt-PT/dashboard.php | 4 ++-- resources/lang/pt-PT/general.php | 16 ++++++++-------- resources/lang/pt-PT/messages.php | 14 +++++++------- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/resources/lang/es-MX/auth.php b/resources/lang/es-MX/auth.php index 543e1ed43..345d79d95 100644 --- a/resources/lang/es-MX/auth.php +++ b/resources/lang/es-MX/auth.php @@ -3,15 +3,15 @@ return [ 'profile' => 'Perfil', - 'logout' => 'Cerrar sesión', - 'login' => 'Iniciar sesión', + 'logout' => 'Salir', + 'login' => 'Entrar', 'login_to' => 'Inicia sesión para comenzar', 'remember_me' => 'Recordarme', 'forgot_password' => 'Olvidé mi contraseña', 'reset_password' => 'Restablecer Contraseña', 'enter_email' => 'Introduce tu Dirección de Correo Electrónico', 'current_email' => 'Dirección de Correo electrónico Actual', - 'reset' => 'Resetear', + 'reset' => 'Restablecer', 'never' => 'nunca', 'password' => [ @@ -23,7 +23,7 @@ return [ 'error' => [ 'self_delete' => 'Error: ¡No puede eliminarse usted mismo!', - 'no_company' => 'Error: No company assigned to your account. Please, contact the system administrator.', + 'no_company' => 'Error: No se asigno una compañía para tu cuenta. Por favor, contacte al administrador del sistema.', ], 'failed' => 'Estas credenciales no coinciden con nuestros registros.', @@ -31,9 +31,9 @@ return [ 'throttle' => 'Demasiados intentos fallidos de inicio de sesión. Por favor, vuelva a intentarlo después de :seconds segundos.', 'notification' => [ - 'message_1' => 'You are receiving this email because we received a password reset request for your account.', - 'message_2' => 'If you did not request a password reset, no further action is required.', - 'button' => 'Reset Password', + 'message_1' => 'Has recibido este correo electrónico porque se solicito un restablecimiento de contraseña para tu cuenta.', + 'message_2' => 'Si no solicitaste que se restablezca tu contraseña, no es necesario realizar ninguna acción', + 'button' => 'Restablecer Contraseña', ], ]; diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php index 9d0ec910a..9f88bd325 100644 --- a/resources/lang/es-MX/general.php +++ b/resources/lang/es-MX/general.php @@ -100,9 +100,9 @@ return [ 'overdue' => 'Vencida', 'partially' => 'Parcial', 'partially_paid' => 'Pagada Parcialmente', - 'export' => 'Export', - 'enable' => 'Enable', - 'disable' => 'Disable', + 'export' => 'Exportar', + 'enable' => 'Activar', + 'disable' => 'Desactivar', 'title' => [ 'new' => 'Nuevo :type', diff --git a/resources/lang/es-MX/import.php b/resources/lang/es-MX/import.php index 4b9dd9a6a..63a4d8085 100644 --- a/resources/lang/es-MX/import.php +++ b/resources/lang/es-MX/import.php @@ -4,6 +4,6 @@ return [ 'import' => 'Importar', 'title' => 'Importar :type', - 'message' => 'Allowed file types: XLS, XLSX. Please, download the sample file.', + 'message' => 'Tipos de archivos permitidos: XLS, XLSX. Por favor, descarga el archivo de ejemplo.', ]; diff --git a/resources/lang/es-MX/messages.php b/resources/lang/es-MX/messages.php index b5dc703e0..d7a7904fc 100644 --- a/resources/lang/es-MX/messages.php +++ b/resources/lang/es-MX/messages.php @@ -8,8 +8,8 @@ return [ 'deleted' => '¡:type eliminado!', 'duplicated' => '¡:type duplicado!', 'imported' => '¡:type importado!', - 'enabled' => ':type enabled!', - 'disabled' => ':type disabled!', + 'enabled' => ':type activado!', + 'disabled' => ':type desactivado!', ], 'error' => [ 'over_payment' => 'Error: Pago no agregado! Cantidad sobre pasa el total.', diff --git a/resources/lang/es-MX/modules.php b/resources/lang/es-MX/modules.php index 9a389a1e0..85f9e020e 100644 --- a/resources/lang/es-MX/modules.php +++ b/resources/lang/es-MX/modules.php @@ -4,7 +4,7 @@ return [ 'title' => 'Token de API', 'api_token' => 'Token', - 'my_apps' => 'My Apps', + 'my_apps' => 'Mis Apps', 'top_paid' => 'Más Pagado', 'new' => 'Nuevo', 'top_free' => 'Top Gratis', @@ -42,7 +42,7 @@ return [ ], 'badge' => [ - 'installed' => 'Installed', + 'installed' => 'Instalado', ], 'button' => [ @@ -52,7 +52,7 @@ return [ ], 'my' => [ - 'purchased' => 'Purchased', - 'installed' => 'Installed', + 'purchased' => 'Comprado', + 'installed' => 'Instalado', ], ]; diff --git a/resources/lang/es-MX/transfers.php b/resources/lang/es-MX/transfers.php index a31734853..4c37b6451 100644 --- a/resources/lang/es-MX/transfers.php +++ b/resources/lang/es-MX/transfers.php @@ -6,7 +6,7 @@ return [ 'to_account' => 'A la Cuenta', 'messages' => [ - 'delete' => ':from to :to (:amount)', + 'delete' => ':from a :to (:amount)', ], ]; diff --git a/resources/lang/pt-PT/dashboard.php b/resources/lang/pt-PT/dashboard.php index 7c2e90d4b..5a7a60c98 100644 --- a/resources/lang/pt-PT/dashboard.php +++ b/resources/lang/pt-PT/dashboard.php @@ -8,7 +8,7 @@ return [ 'overdue_invoices' => 'Faturas Vencidas', 'total_expenses' => 'Despesas totais', 'payables' => 'A Pagar', - 'open_bills' => 'Contas Abertas', + 'open_bills' => 'Contas em Aberto', 'overdue_bills' => 'Contas Vencidas', 'total_profit' => 'Lucro Total', 'open_profit' => 'Lucro em Aberto', @@ -17,7 +17,7 @@ return [ 'no_profit_loss' => 'Sem perda de lucro', 'incomes_by_category' => 'Rendimento por Categoria', 'expenses_by_category' => 'Despesa por Categoria', - 'account_balance' => 'Saldo da Conta', + 'account_balance' => 'Saldo da(s) Conta(s)', 'latest_incomes' => 'Últimas Receitas', 'latest_expenses' => 'Últimas Despesas', diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php index 8f539f24e..39350185f 100644 --- a/resources/lang/pt-PT/general.php +++ b/resources/lang/pt-PT/general.php @@ -45,7 +45,7 @@ return [ 'no_records' => 'Sem Registos.', 'date' => 'Data', 'amount' => 'Montante', - 'enabled' => 'Activado', + 'enabled' => 'Ativo', 'disabled' => 'Desativado', 'yes' => 'Sim', 'no' => 'Não', @@ -55,8 +55,8 @@ return [ 'quarterly' => 'Trimestral', 'yearly' => 'Anual', 'add' => 'Adicionar', - 'add_new' => 'Novo', - 'show' => 'Visualizar', + 'add_new' => 'Novo(a)', + 'show' => 'Mostrar', 'edit' => 'Editar', 'delete' => 'Excluir', 'send' => 'Enviar', @@ -88,8 +88,8 @@ return [ 'search_placeholder' => 'Digite para procurar..', 'filter' => 'Filtrar', 'help' => 'Ajuda', - 'all' => 'Todos', - 'all_type' => 'Todos os :type', + 'all' => 'Todos(as)', + 'all_type' => 'Todos(as) os(as) :type', 'upcoming' => 'Próximo', 'created' => 'Criado', 'id' => 'ID', @@ -101,11 +101,11 @@ return [ 'partially' => 'Parcialmente', 'partially_paid' => 'Parcialmente Pago', 'export' => 'Exportar', - 'enable' => 'Ativado', - 'disable' => 'Desativado', + 'enable' => 'Activar', + 'disable' => 'Desactivar', 'title' => [ - 'new' => 'Novo :type', + 'new' => 'Novo(a) :type', 'edit' => 'Editar :type', ], diff --git a/resources/lang/pt-PT/messages.php b/resources/lang/pt-PT/messages.php index d4e8df3c9..4ddb7c281 100644 --- a/resources/lang/pt-PT/messages.php +++ b/resources/lang/pt-PT/messages.php @@ -3,13 +3,13 @@ return [ 'success' => [ - 'added' => ':type adicionado!', - 'updated' => ':type atualizado!', - 'deleted' => ':type excluído!', - 'duplicated' => ':type duplicado!', - 'imported' => ':type importado!', - 'enabled' => ':type ativado!', - 'disabled' => ': type desativado!', + 'added' => ':type adicionado(a)!', + 'updated' => ':type atualizada(s)!', + 'deleted' => ':type excluído(a)!', + 'duplicated' => ':type duplicado(a)!', + 'imported' => ':type importado(a)!', + 'enabled' => ':type ativado(a)!', + 'disabled' => ': type desativado(a)!', ], 'error' => [ 'over_payment' => 'Erro: Pagamento não adicionado! O valor passa o total.',