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

pluralization wave 1

Browse Source
This commit is contained in:
Florian Dupret
2020-05-29 18:00:29 +02:00
parent d5d5530a8e
commit da38df6e4b
8 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/v1/profile/index.twig
View File

@@ -102,7 +102,7 @@
<p class="text-info">{{ 'pref_two_factor_auth_help'|_ }}</p>
{% if enabled2FA == true %}
<p class="text-info">
{{ trans('firefly.pref_two_factor_backup_code_count', {count: mfaBackupCount}) }}
{{ trans_choice('firefly.pref_two_factor_backup_code_count', mfaBackupCount) }}
</p>
<div class="btn-group">

2
resources/views/v1/rules/index.twig
View File

@@ -150,7 +150,7 @@
{% if not rule.active %}
class="text-muted"
{% endif %}
data-id="{{ trigger.id }}">{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}
data-id="{{ trigger.id }}">{{ trans_choice(('firefly.rule_trigger_' ~ trigger.trigger_type), trigger.trigger_value, {trigger_value: trigger.trigger_value}) }}
{% if trigger.stop_processing %}
<i class="fa fa-stop-circle-o"></i>

11
resources/views/v1/rules/rule-group/delete.twig
View File

@@ -23,15 +23,14 @@
{{ trans('form.ruleGroup_areYouSure', {'title': ruleGroup.title}) }}
</p>
<p class="text-danger">
{% if ruleGroup.rules|length > 0 %}
{{ Lang.choice('form.also_delete_rules', ruleGroup.rules|length, {count: ruleGroup.rules|length}) }}
{% endif %}
</p>
{% if ruleGroup.rules|length > 0 %}
<p class="text-danger">
{{ trans_choice('form.also_delete_rules', ruleGroup.rules|length) }}
</p>
<p class="text-success">
{{ 'save_rules_by_moving'|_ }}
{{ trans_choice('firefly.save_rules_by_moving', ruleGroup.rules|length) }}
</p>
<p>

4
resources/views/v1/search/search.twig
View File

@@ -1,9 +1,9 @@
<p>
<p class="search_count">
{% if hasPages %}
{{ trans('firefly.search_found_transactions', {count: '>'~groups.perPage, time: searchTime}) }}
{{ trans('firefly.search_found_more_transactions', {count: groups.perPage, time: searchTime}) }}
{% else %}
{{ trans('firefly.search_found_transactions', {count: groups.count, time: searchTime}) }}
{{ trans_choice('firefly.search_found_transactions', groups.count, {time: searchTime}) }}
{% endif %}
</p>

18
resources/views/v1/transactions/convert.twig
View File

@@ -19,32 +19,38 @@
<p>
{# ONE: WITHDRAWAL TO DEPOSIT #}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Deposit' %}
{{ 'convert_expl_w_d'|_ }}
{{ trans_choice('firefly.convert_expl_w_d', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
{% endif %}
{# TWO: WITHDRAWAL TO TRANSFER #}
{% if sourceType.type == 'Withdrawal' and destinationType.type == 'Transfer' %}
{{ 'convert_expl_w_t'|_ }}
{{ trans_choice('firefly.convert_expl_w_t', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
{% endif %}
{# THREE: DEPOSIT TO WITHDRAWAL #}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Withdrawal' %}
{{ 'convert_expl_d_w'|_ }}
{{ trans_choice('firefly.convert_expl_d_w', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
{% endif %}
{# FOUR: DEPOSIT TO TRANSFER#}
{% if sourceType.type == 'Deposit' and destinationType.type == 'Transfer' %}
{{ 'convert_expl_d_t'|_ }}
{{ trans_choice('firefly.convert_expl_d_t', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
{% endif %}
{# FIVE: TRANSFER TO WITHDRAWAL #}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Withdrawal' %}
{{ 'convert_expl_t_w'|_ }}
{{ trans_choice('firefly.convert_expl_t_w', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_destinations', groupArray.transactions|length) }}
{% endif %}
{# SIX: TRANSFER TO DEPOSIT #}
{% if sourceType.type == 'Transfer' and destinationType.type == 'Deposit' %}
{{ 'convert_expl_t_d'|_ }}
{{ trans_choice('firefly.convert_expl_t_d', groupArray.transactions|length) }}
{{ trans_choice('firefly.convert_select_sources', groupArray.transactions|length) }}
{% endif %}
</p>

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

@@ -82,7 +82,7 @@
{% if first.transactiontype.type != 'Withdrawal' or splits == 1 %}
<tr>
<td>
{{ 'source_accounts'|_ }}
{{ trans_choice('firefly.source_accounts', groupArray.transactions|length ) }}
</td>
<td>
{% for journal in groupArray.transactions %}
@@ -103,7 +103,7 @@
{% if first.transactiontype.type != 'Deposit' or splits == 1 %}
<tr>
<td>
{{ 'destination_accounts'|_ }}
{{ trans_choice('firefly.destination_accounts', groupArray.transactions|length ) }}
</td>
<td>