From ba9601d21c58078b27fb48c4902f04214aaf488e Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 24 Jul 2015 08:34:30 +0200 Subject: [PATCH] Better display for piggy bank events. --- resources/lang/en/firefly.php | 2 ++ resources/twig/list/piggy-bank-events.twig | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index f6884d8cf7..4b5f909541 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -19,6 +19,8 @@ return [ 'never' => 'Never', 'search_results_for' => 'Search results for ":query"', 'bounce_error' => 'The message sent to :email bounced.', + 'removed_amount' => 'Removed :amount', + 'added_amount' => 'Added :amount', // attachments 'nr_of_attachments' => 'One attachment|:count attachments', diff --git a/resources/twig/list/piggy-bank-events.twig b/resources/twig/list/piggy-bank-events.twig index 7181ff157c..b6e7ffa8b5 100644 --- a/resources/twig/list/piggy-bank-events.twig +++ b/resources/twig/list/piggy-bank-events.twig @@ -16,17 +16,19 @@ {% if event.transaction_journal_id %} {{ event.date.format('j F Y') }} + title="{{ event.transactionJournal.description }}">{{ event.date.formatLocalized(monthAndDayFormat) }} {% else %} - {{ event.date.format('j F Y') }} + {{ event.date.formatLocalized(monthAndDayFormat) }} {% endif %} {% if event.amount < 0 %} - Removed {{ event.amount*-1|formatAmountPlain }} + + {{ trans('firefly.removed_amount', {amount: (event.amount*-1)|formatAmountPlain})|raw }} {% else %} - Added {{ event.amount|formatAmountPlain }} + + {{ trans('firefly.added_amount', {amount: (event.amount)|formatAmountPlain})|raw }} {% endif %}