Merge pull request #1593 from lucavallerini/transactions-links-translatable

Transactions links are now translatable on admin views
This commit is contained in:
James Cole
2018-08-04 14:14:33 +02:00
committed by GitHub
3 changed files with 9 additions and 5 deletions

View File

@@ -1141,6 +1141,10 @@ return [
'link_relates to' => 'relates to',
// link translations:
'Paid_name' => 'Paid',
'Refund_name' => 'Refund',
'Reimbursement_name' => 'Reimbursement',
'Related_name' => 'Related',
'relates to_inward' => 'relates to',
'is (partially) refunded by_inward' => 'is (partially) refunded by',
'is (partially) paid for by_inward' => 'is (partially) paid for by',

View File

@@ -35,13 +35,13 @@
{% endif %}
</td>
<td>
<strong>{{ linkType.name }}</strong>
<strong>{{ journalLinkTranslation('name', linkType.name) }}</strong>
</td>
<td>
{{ linkType.inward }}
{{ journalLinkTranslation('inward', linkType.inward) }}
</td>
<td>
{{ linkType.outward }}
{{ journalLinkTranslation('outward', linkType.outward) }}
</td>
<td data-value="{{ linkType.journalCount }}">
<a href="{{ route('admin.links.show', [linkType.id]) }}">{{ linkType.journalCount }}</a>

View File

@@ -8,7 +8,7 @@
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('firefly.overview_for_link', {name: linkType.name}) }}</h3>
<h3 class="box-title">{{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-hover sortable">
@@ -36,7 +36,7 @@
<a href="{{ route('transactions.show', [link.source_id]) }}">{{ link.source.description }}</a>
</td>
<td>{{ link.source|journalTotalAmount }}</td>
<td>{{ linkType.outward }}</td>
<td>{{ journalLinkTranslation('outward', linkType.outward) }}</td>
<td data-value="{{ link.destination.description }}">
<a href="{{ route('transactions.show', [link.destination_id]) }}">{{ link.destination.description }}</a>
</td>