Expand view and translations.

This commit is contained in:
James Cole 2016-01-13 16:51:55 +01:00
parent 20941dedd3
commit e9ee93beb7
2 changed files with 109 additions and 49 deletions

View File

@ -2,44 +2,82 @@
return [
// general stuff:
'language_incomplete' => 'This language is not yet fully translated',
'test' => 'You have selected English.',
'close' => 'Close',
'pleaseHold' => 'Please hold...',
'actions' => 'Actions',
'edit' => 'Edit',
'delete' => 'Delete',
'welcomeBack' => 'What\'s playing?',
'everything' => 'Everything',
'customRange' => 'Custom range',
'apply' => 'Apply',
'cancel' => 'Cancel',
'from' => 'From',
'to' => 'To',
'total_sum' => 'Total sum',
'period_sum' => 'Sum for period',
'showEverything' => 'Show everything',
'never' => 'Never',
'search_results_for' => 'Search results for ":query"',
'bounced_error' => 'The message sent to :email bounced, so no access for you.',
'deleted_error' => 'These credentials do not match our records.',
'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
'removed_amount' => 'Removed :amount',
'added_amount' => 'Added :amount',
'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
'Opening balance' => 'Opening balance',
'create_new_stuff' => 'Create new stuff',
'new_withdrawal' => 'New withdrawal',
'new_deposit' => 'New deposit',
'new_transfer' => 'New transfer',
'new_asset_account' => 'New asset account',
'new_expense_account' => 'New expense account',
'new_revenue_account' => 'New revenue account',
'new_budget' => 'New budget',
'new_bill' => 'New bill',
'language_incomplete' => 'This language is not yet fully translated',
'test' => 'You have selected English.',
'close' => 'Close',
'pleaseHold' => 'Please hold...',
'actions' => 'Actions',
'edit' => 'Edit',
'delete' => 'Delete',
'welcomeBack' => 'What\'s playing?',
'everything' => 'Everything',
'customRange' => 'Custom range',
'apply' => 'Apply',
'cancel' => 'Cancel',
'from' => 'From',
'to' => 'To',
'total_sum' => 'Total sum',
'period_sum' => 'Sum for period',
'showEverything' => 'Show everything',
'never' => 'Never',
'search_results_for' => 'Search results for ":query"',
'bounced_error' => 'The message sent to :email bounced, so no access for you.',
'deleted_error' => 'These credentials do not match our records.',
'general_blocked_error' => 'Your account has been disabled, so you cannot login.',
'removed_amount' => 'Removed :amount',
'added_amount' => 'Added :amount',
'asset_account_role_help' => 'Any extra options resulting from your choice can be set later.',
'Opening balance' => 'Opening balance',
'create_new_stuff' => 'Create new stuff',
'new_withdrawal' => 'New withdrawal',
'new_deposit' => 'New deposit',
'new_transfer' => 'New transfer',
'new_asset_account' => 'New asset account',
'new_expense_account' => 'New expense account',
'new_revenue_account' => 'New revenue account',
'new_budget' => 'New budget',
'new_bill' => 'New bill',
// rules
'rules' => 'Rules',
'rules' => 'Rules',
'rules_explanation' => 'Here is going to be text',
'rule_name' => 'Name of rule',
'rule_triggers' => 'Rule triggers when',
'rule_actions' => 'Rule will',
'new_rule' => 'New rule',
'new_rule_group' => 'New rule group',
'rule_priority_up' => 'Give rule more priority',
'rule_priority_down' => 'Give rule less priority',
// actions and triggers
'rule_trigger_user_action' => '',
'rule_trigger_from_account_starts' => 'from_account_starts',
'rule_trigger_from_account_ends' => 'from_account_ends',
'rule_trigger_from_account_is' => 'Source account is ":trigger_value"',
'rule_trigger_from_account_contains' => '',
'rule_trigger_to_account_starts' => '',
'rule_trigger_to_account_ends' => '',
'rule_trigger_to_account_is' => '',
'rule_trigger_to_account_contains' => '',
'rule_trigger_transaction_type' => '',
'rule_trigger_amount_less' => '',
'rule_trigger_amount_exactly' => 'Amount is :trigger_value',
'rule_trigger_amount_more' => '',
'rule_trigger_description_starts' => '',
'rule_trigger_description_ends' => '',
'rule_trigger_description_contains' => 'Description contains ":trigger_value"',
'rule_trigger_description_is' => '',
'rule_action_set_category' => 'Set category to ":action_value"',
'rule_action_clear_category' => 'Clear category',
'rule_action_set_budget' => 'Set budget to ":action_value"',
'rule_action_clear_budget' => 'Clear budget',
'rule_action_add_tag' => 'Add tag ":action_value"',
'rule_action_remove_tag' => 'Remove tag ":action_value"',
'rule_action_remove_all_tags' => 'Remove all tags',
'rule_action_set_description' => 'Set description to ":action_value"',
'rule_action_append_description' => 'Append description with ":action_value"',
'rule_action_prepend_description' => 'Prepend description with ":action_value"',
// tags
'store_new_tag' => 'Store new tag',

View File

@ -50,23 +50,27 @@
</p>
{% if ruleGroup.rules.count > 0 %}
<table class="table table- table-striped sortable">
<table class="table table-hover table-striped sortable">
<thead>
<tr>
<th colspan="2">{{ 'rule_name'|_ }}</th>
<th>{{ 'rule_triggers'|_ }}</th>
<th>{{ 'rule_actions'|_ }}</th>
</tr>
<tr>
<th colspan="2">{{ 'rule_name'|_ }}</th>
<th>{{ 'rule_triggers'|_ }}</th>
<th>{{ 'rule_actions'|_ }}</th>
</tr>
</thead>
<tbody>
{% for rule in ruleGroup.rules %}
<tr>
<td>
<div class="btn-group btn-group-xs">
<a title="{{ 'rule_priority_up' }}" href="{{ route('rules.rule.up', rule.id) }}" class="btn btn-default"><span class="fa fa-arrow-up"></span></a>
<a title="{{ 'rule_priority_down' }}" href="{{ route('rules.rule.down', rule.id) }}" class="btn btn-default"><span class="fa fa-arrow-down"></span></a>
<a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}" class="btn btn-default"><span class="fa fa-pencil"></span></a>
<a title="{{ 'delete'|_ }}" href="{{ route('rules.rule.delete', rule.id) }}" class="btn btn-danger"><span class="fa fa-trash"></span></a>
<a title="{{ 'rule_priority_up'|_ }}" href="{{ route('rules.rule.up', rule.id) }}" class="btn btn-default"><span
class="fa fa-arrow-up"></span></a>
<a title="{{ 'rule_priority_down'|_ }}" href="{{ route('rules.rule.down', rule.id) }}"
class="btn btn-default"><span class="fa fa-arrow-down"></span></a>
<a title="{{ 'edit'|_ }}" href="{{ route('rules.rule.edit', rule.id) }}" class="btn btn-default"><span
class="fa fa-pencil"></span></a>
<a title="{{ 'delete'|_ }}" href="{{ route('rules.rule.delete', rule.id) }}" class="btn btn-danger"><span
class="fa fa-trash"></span></a>
</div>
</td>
@ -75,8 +79,26 @@
<small><br/>{{ rule.description }}</small>
{% endif %}
</td>
<td>X</td>
<td>Y</td>
<td>
{% if rule.ruleTriggers.count > 0 %}
<ul class="small">
{% for trigger in rule.ruleTriggers %}
{% if trigger.trigger_type != "user_action" %}
<li>{{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
</td>
<td>
{% if rule.ruleActions.count > 0 %}
<ul class="small">
{% for action in rule.ruleActions %}
<li>{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}</li>
{% endfor %}
</ul>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
@ -87,7 +109,7 @@
</p>
{% endif %}
<p>
<br />
<br/>
<a href="{{ route('rules.rule.create') }}" class="btn btn-success">{{ 'new_rule'|_ }}</a>
</p>
</div>