IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix untranslatable strings #3159

Browse Source
This commit is contained in:
James Cole 2020-02-29 13:58:34 +01:00
parent 4434ea40ee
commit d580bf8f43
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Transaction/ShowController.php
View File

@ -88,7 +88,7 @@ class ShowController extends Controller
throw new FireflyException('This transaction is broken :(.');
}
$type = $first->transactionType->type;
$type = (string)trans(sprintf('firefly.%s',$first->transactionType->type));
$title = 1 === $splits ? $first->description : $transactionGroup->title;
$subTitle = sprintf('%s: "%s"', $type, $title);

4
app/Repositories/Account/AccountRepository.php
View File

@ -473,7 +473,9 @@ class AccountRepository implements AccountRepositoryInterface
if (AccountType::ASSET !== $account->accountType->type) {
throw new FireflyException(sprintf('%s is not an asset account.', $account->name));
}
$name = $account->name . ' reconciliation';
$name = trans('firefly.reconciliation_account_name', ['name' => $account->name]);
/** @var AccountType $type */
$type = AccountType::where('type', AccountType::RECONCILIATION)->first();
$accounts = $this->user->accounts()->where('account_type_id', $type->id)->get();

1
resources/lang/en_US/breadcrumbs.php
View File

@ -51,6 +51,7 @@ return [
'edit_journal' => 'Edit transaction ":description"',
'edit_reconciliation' => 'Edit ":description"',
'delete_journal' => 'Delete transaction ":description"',
'delete_group' => 'Delete transaction ":description"',
'tags' => 'Tags',
'createTag' => 'Create new tag',
'edit_tag' => 'Edit tag ":tag"',

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

@ -205,6 +205,7 @@ return [
'active_exp_bills_only' => 'active and expected bills only',
'average_per_bill' => 'average per bill',
'expected_total' => 'expected total',
'reconciliation_account_name' => ':name reconciliation',
// API access
'authorization_request' => 'Firefly III v:version Authorization Request',
'authorization_request_intro' => '<strong>:client</strong> is requesting permission to access your financial administration. Would you like to authorize <strong>:client</strong> to access these records?',
@ -215,6 +216,8 @@ return [
'name_in_currency' => ':name in :currency',
'paid_in_currency' => 'Paid in :currency',
'unpaid_in_currency' => 'Unpaid in :currency',
'is_alpha_warning' => 'You are running an ALPHA version. Be wary of bugs and issues.',
'is_beta_warning' => 'You are running an BETA version. Be wary of bugs and issues.',
// check for updates:
'update_check_title' => 'Check for updates',
@ -1391,6 +1394,13 @@ return [
'(partially) refunds_outward' => '(partially) refunds',
'(partially) pays for_outward' => '(partially) pays for',
'(partially) reimburses_outward' => '(partially) reimburses',
'is (partially) refunded by' => 'is (partially) refunded by',
'is (partially) paid for by' => 'is (partially) paid for by',
'is (partially) reimbursed by' => 'is (partially) reimbursed by',
'relates to' => 'relates to',
'(partially) refunds' => '(partially) refunds',
'(partially) pays for' => '(partially) pays for',
'(partially) reimburses' => '(partially) reimburses',
// split a transaction:
'splits' => 'Splits',

6
resources/views/v1/layout/default.twig
View File

@ -141,9 +141,9 @@
<b>{{ 'version'|_ }}</b> <a href="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a>
</div>
<strong><a href="https://github.com/firefly-iii/firefly-iii">Firefly III</a></strong>
<small class="text-muted">Developed by James Cole, the source code is licensed under the <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small>
{% if FF_IS_ALPHA %}<small class="text-danger"><br>You are running an ALPHA version. Be wary of bugs and issues.</small>{% endif %}
{% if FF_IS_BETA %}<small class="text-warning"><br>You are running an BETA version. Be wary of bugs and issues.</small>{% endif %}
<small class="text-muted">&copy; James Cole, <a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0-or-later</a>.</small>
{% if FF_IS_ALPHA %}<small class="text-danger"><br>{{ 'is_alpha_warning'|_ }}</small>{% endif %}
{% if FF_IS_BETA %}<small class="text-warning"><br>{{ 'is_beta_warning'|_ }}</small>{% endif %}
</footer>
{% include('partials.control-bar') %}

2
resources/views/v1/transactions/show.twig
View File

@ -302,7 +302,7 @@
<a href="{{ route('transactions.link.delete', [link.id]) }}" class="btn btn-danger"><i class="fa fa-trash"></i></a>
</div>
</td>
<td>{{ link.link }} "<a href="{{ route('transactions.show', link.group) }}"
<td>{{ trans('firefly.'~link.link) }} "<a href="{{ route('transactions.show', link.group) }}"
title="{{ link.description }}">{{ link.description }}</a>"
({{ link.amount|raw }})