From e9ee93beb76b97134bb48cdf3c94bb34f5756812 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 13 Jan 2016 16:51:55 +0100 Subject: [PATCH] Expand view and translations. --- resources/lang/en_US/firefly.php | 110 +++++++++++++++++++++---------- resources/views/rules/index.twig | 48 ++++++++++---- 2 files changed, 109 insertions(+), 49 deletions(-) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index ecdbe1b167..f903077de7 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -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', diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig index 9ff1e870bd..829b626fdd 100644 --- a/resources/views/rules/index.twig +++ b/resources/views/rules/index.twig @@ -50,23 +50,27 @@

{% if ruleGroup.rules.count > 0 %} - +
- - - - - + + + + + {% for rule in ruleGroup.rules %} @@ -75,8 +79,26 @@
{{ rule.description }} {% endif %} - - + + {% endfor %} @@ -87,7 +109,7 @@

{% endif %}

-
+
{{ 'new_rule'|_ }}

{{ 'rule_name'|_ }}{{ 'rule_triggers'|_ }}{{ 'rule_actions'|_ }}
{{ 'rule_name'|_ }}{{ 'rule_triggers'|_ }}{{ 'rule_actions'|_ }}
- - - - + + + +
XY + {% if rule.ruleTriggers.count > 0 %} +
    + {% for trigger in rule.ruleTriggers %} + {% if trigger.trigger_type != "user_action" %} +
  • {{ trans(('firefly.rule_trigger_' ~ trigger.trigger_type), {trigger_value: trigger.trigger_value}) }}
    • + {% endif %} + {% endfor %} +
+ {% endif %} + 		+ {% if rule.ruleActions.count > 0 %} +
    + {% for action in rule.ruleActions %} +
  • {{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}
    • + {% endfor %} +
+ {% endif %} +