From db2485f97a1bca8e252905038525514f18aa24d1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 3 Oct 2022 05:49:25 +0200 Subject: [PATCH] Clean up rule form. --- public/v1/js/ff/rules/select-transactions.js | 3 --- resources/lang/en_US/firefly.php | 19 ++++++++----------- .../rules/rule-group/select-transactions.twig | 6 ------ .../views/rules/rule/select-transactions.twig | 6 ------ 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/public/v1/js/ff/rules/select-transactions.js b/public/v1/js/ff/rules/select-transactions.js index 92a5465340..beca8beafb 100644 --- a/public/v1/js/ff/rules/select-transactions.js +++ b/public/v1/js/ff/rules/select-transactions.js @@ -29,7 +29,4 @@ $(document).ready(function () { } ); } - // $('form.form-horizontal').on('submit', function () { - // return confirm(askReadWarning); - // }); }); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 33e455bd3f..1d662f616e 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1213,17 +1213,14 @@ return [ 'rule_action_append_notes_to_descr' => 'Append notes to description', 'rule_action_move_descr_to_notes' => 'Replace notes with description', 'rule_action_move_notes_to_descr' => 'Replace description with notes', - - 'rules_have_read_warning' => 'Have you read the warning ? ', - 'apply_rule_warning' => 'Warning: running a rule(group) on a large selection of transactions could take ages, and it could time - out . if it does, the rule(group) will only be applied to an unknown subset of your transactions . This might leave your financial administration in tatters . Please be careful . ', - 'rulegroup_for_bills_title' => 'Rule group for bills', - 'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills . ', - 'rule_for_bill_title' => 'Auto - generated rule for bill ":name"', - 'rule_for_bill_description' => 'This rule is auto - generated to try to match bill ":name" . ', - 'create_rule_for_bill' => 'Create a new rule for bill ":name"', - 'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill . for example, whenever you pay your rent, the bill "rent" will be linked to the expense . This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.', - 'new_rule_for_bill_title' => 'Rule for bill ":name"', - 'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".', + 'rulegroup_for_bills_title' => 'Rule group for bills', + 'rulegroup_for_bills_description' => 'A special rule group for all the rules that involve bills.', + 'rule_for_bill_title' => 'Auto-generated rule for bill ":name"', + 'rule_for_bill_description' => 'This rule is auto-generated to try to match bill ":name".', + 'create_rule_for_bill' => 'Create a new rule for bill ":name"', + 'create_rule_for_bill_txt' => 'You have just created a new bill called ":name", congratulations!Firefly III can automagically match new withdrawals to this bill. For example, whenever you pay your rent, the bill "rent" will be linked to the expense. This way, Firefly III can accurately show you which bills are due and which ones aren\'t. In order to do so, a new rule must be created. Firefly III has filled in some sensible defaults for you. Please make sure these are correct. If these values are correct, Firefly III will automatically link the correct withdrawal to the correct bill. Please check out the triggers to see if they are correct, and add some if they\'re wrong.', + 'new_rule_for_bill_title' => 'Rule for bill ":name"', + 'new_rule_for_bill_description' => 'This rule marks transactions for bill ":name".', 'new_rule_for_journal_title' => 'Rule based on transaction ":description"', 'new_rule_for_journal_description' => 'This rule is based on transaction ":description". It will match transactions that are exactly the same.', diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig index e74814b554..e04b098681 100644 --- a/resources/views/rules/rule-group/select-transactions.twig +++ b/resources/views/rules/rule-group/select-transactions.twig @@ -21,9 +21,6 @@

{{ trans('firefly.apply_rule_group_selection_intro', {title: ruleGroup.title}) }}

-

- {{ 'apply_rule_warning'|_ }} -

{{ ExpandedForm.date('start', first) }} @@ -42,9 +39,6 @@ {% endblock %} {% block scripts %} - diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig index 65ddd88c2c..0b9aecde08 100644 --- a/resources/views/rules/rule/select-transactions.twig +++ b/resources/views/rules/rule/select-transactions.twig @@ -21,9 +21,6 @@

{{ trans('firefly.apply_rule_selection_intro', {title: rule.title}) }}

-

- {{ 'apply_rule_warning'|_ }} -

{{ ExpandedForm.date('start', first) }} @@ -42,9 +39,6 @@ {% endblock %} {% block scripts %} -