From f3414ddbd8327c3942fd485caabc51bebaaf817a Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 21 May 2018 20:05:37 +0300 Subject: [PATCH] language fix #349 --- app/Http/Controllers/Banking/Transfers.php | 6 ++---- resources/lang/en-GB/general.php | 1 + resources/lang/en-GB/transfers.php | 6 +++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index d7662cb4d..2ad990df0 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -37,13 +37,11 @@ class Transfers extends Controller $revenue = $item->revenue; $payment = $item->payment; - $data_name = [ + $name = trans('transfers.messages.delete', [ 'from' => $payment->account->name, 'to' => $revenue->account->name, 'amount' => money($payment->amount, $payment->currency_code, true) - ]; - - $name = trans('transfers.delete_transfer', $data_name); + ]); $transfers[] = (object)[ 'id' => $item->id, diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 530c03a9e..45e49a617 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -105,6 +105,7 @@ return [ 'new' => 'New :type', 'edit' => 'Edit :type', ], + 'form' => [ 'enter' => 'Enter :field', 'select' => [ diff --git a/resources/lang/en-GB/transfers.php b/resources/lang/en-GB/transfers.php index 9b1d87e98..f79af31d4 100644 --- a/resources/lang/en-GB/transfers.php +++ b/resources/lang/en-GB/transfers.php @@ -4,5 +4,9 @@ return [ 'from_account' => 'From Account', 'to_account' => 'To Account', - 'delete_transfer' => 'Transfer : :from to :to :amount', + + 'messages' => [ + 'delete' => ':from to :to (:amount)', + ], + ];