kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 19:01:58 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
parent c73b003de4 bf3c57d26b
commit 2ebb4778cd
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/lang/en_US/firefly.php
View File

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

6
resources/views/admin/link/index.twig
View File

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

4
resources/views/admin/link/show.twig
View File

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