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

Merge pull request #10205 from firefly-iii/fix-10197

Browse Source 
Fix #10197
This commit is contained in:
James Cole
2025-04-26 14:24:37 +02:00
committed by GitHub
parent c16d3be85f b50f8f8ecd
commit 35e2eba303
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Rule/EditController.php
View File

@@ -135,7 +135,7 @@ class EditController extends Controller
// get rule trigger for update / store-journal: // get rule trigger for update / store-journal:
$primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule); $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule);
$subTitle = (string) trans('firefly.edit_rule', ['title' => $rule->title]); $subTitle = (string) trans('firefly.edit_rule', ['nr' => $rule->order,'title' => $rule->title]);
// put previous url in session if not redirect from store (not "return_to_edit"). // put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rules.edit.fromUpdate')) { if (true !== session('rules.edit.fromUpdate')) {

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

@@ -802,7 +802,7 @@ return [
'action_value' => 'Action value', 'action_value' => 'Action value',
'stop_executing_other_actions' => 'Stop executing other actions', 'stop_executing_other_actions' => 'Stop executing other actions',
'add_rule_action' => 'Add new action', 'add_rule_action' => 'Add new action',
'edit_rule' => 'Edit rule ":title"', 'edit_rule' => 'Edit rule #:nr ":title"',
'delete_rule' => 'Delete rule ":title"', 'delete_rule' => 'Delete rule ":title"',
'update_rule' => 'Update rule', 'update_rule' => 'Update rule',
'test_rule_triggers' => 'See matching transactions', 'test_rule_triggers' => 'See matching transactions',

2
routes/breadcrumbs.php
View File

@@ -994,7 +994,7 @@ Breadcrumbs::for(
'rules.edit', 'rules.edit',
static function (Generator $breadcrumbs, Rule $rule): void { static function (Generator $breadcrumbs, Rule $rule): void {
$breadcrumbs->parent('rules.index'); $breadcrumbs->parent('rules.index');
$breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule])); $breadcrumbs->push(trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]), route('rules.edit', [$rule]));
} }
); );
Breadcrumbs::for( Breadcrumbs::for(