From ae78a177b0e887ea1b98c35ba5229cc3642473ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Lo=CC=88sken?= Date: Thu, 30 Jun 2016 14:38:55 +0200 Subject: [PATCH] Fix #562 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make „Manual entry“ translatable --- app/Http/Controllers/ClientPortalController.php | 2 +- app/Ninja/Datatables/PaymentDatatable.php | 2 +- resources/lang/de/texts.php | 1 + resources/lang/en/texts.php | 1 + resources/lang/es_ES/texts.php | 2 +- resources/lang/fr/texts.php | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php index a22ca204ed..4039bc4ea3 100644 --- a/app/Http/Controllers/ClientPortalController.php +++ b/app/Http/Controllers/ClientPortalController.php @@ -372,7 +372,7 @@ class ClientPortalController extends BaseController return Datatable::query($payments) ->addColumn('invoice_number', function ($model) { return $model->invitation_key ? link_to('/view/'.$model->invitation_key, $model->invoice_number)->toHtml() : $model->invoice_number; }) - ->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : 'Manual entry'; }) + ->addColumn('transaction_reference', function ($model) { return $model->transaction_reference ? $model->transaction_reference : ''.trans('manual_entry').''; }) ->addColumn('payment_type', function ($model) { return ($model->payment_type && !$model->last4) ? $model->payment_type : ($model->account_gateway_id ? 'Online payment' : ''); }) ->addColumn('amount', function ($model) { return Utils::formatMoney($model->amount, $model->currency_id, $model->country_id); }) ->addColumn('payment_date', function ($model) { return Utils::dateToString($model->payment_date); }) diff --git a/app/Ninja/Datatables/PaymentDatatable.php b/app/Ninja/Datatables/PaymentDatatable.php index 857147ec38..25691bbe5a 100644 --- a/app/Ninja/Datatables/PaymentDatatable.php +++ b/app/Ninja/Datatables/PaymentDatatable.php @@ -43,7 +43,7 @@ class PaymentDatatable extends EntityDatatable [ 'transaction_reference', function ($model) { - return $model->transaction_reference ? $model->transaction_reference : 'Manual entry'; + return $model->transaction_reference ? $model->transaction_reference : ''.trans('manual_entry').''; } ], [ diff --git a/resources/lang/de/texts.php b/resources/lang/de/texts.php index 418fa6c3ed..6b8acbf315 100644 --- a/resources/lang/de/texts.php +++ b/resources/lang/de/texts.php @@ -25,6 +25,7 @@ return array( 'size_id' => 'Firmengröße', 'industry_id' => 'Kategorie', 'private_notes' => 'Notizen', + 'manual_entry' => 'Manuelle Eingabe', // invoice 'invoice' => 'Rechnung', diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index f8c998321e..ff3ea396cb 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1360,6 +1360,7 @@ $LANG = array( 'added_on' => 'Added :date', 'failed_remove_payment_method' => 'Failed to remove the payment method', 'gateway_exists' => 'This gateway already exists', + 'manual_entry' => 'Manual entry', ); diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php index 09d87bef87..4e49d5c305 100644 --- a/resources/lang/es_ES/texts.php +++ b/resources/lang/es_ES/texts.php @@ -558,7 +558,7 @@ return array( 'converted' => 'Modificada', //------Texto extraido ----------------------------------------------------------------------------------------- - 'Manual entry' => 'Entrada Manual', + 'manual_entry' => 'Entrada Manual', // Error 'Whoops, looks like something went wrong.' => 'Vaya, parece que algo salió mal', diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php index a432238c68..521e96dcc5 100644 --- a/resources/lang/fr/texts.php +++ b/resources/lang/fr/texts.php @@ -25,6 +25,7 @@ return array( 'size_id' => 'Taille', 'industry_id' => 'Secteur', 'private_notes' => 'Note personnelle', + 'manual_entry' => 'Entrée manuel', // invoice 'invoice' => 'Facture',