kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Clean up translations and strings in import routine.

Browse Source
This commit is contained in:
James Cole
2018-04-29 19:28:07 +02:00
parent d2bb65bf04
commit fa41d6df04
7 changed files with 205 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Import/IndexController.php
View File

@@ -162,7 +162,7 @@ class IndexController extends Controller
$providers[$name]['prereq_complete'] = $result;
}
$subTitle = trans('firefly.import_index_sub_title');
$subTitle = trans('import.index_breadcrumb');
$subTitleIcon = 'fa-home';
return view('import.index', compact('subTitle', 'subTitleIcon', 'providers'));

6
app/Http/Controllers/Import/ConfigurationController.php → app/Http/Controllers/Import/JobConfigurationController.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* ConfigurationController.php
* JobConfigurationController.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
@@ -32,9 +32,9 @@ use Illuminate\Http\Request;
use Log;
/**
* Class ConfigurationController
* Class JobConfigurationController
*/
class ConfigurationController extends Controller
class JobConfigurationController extends Controller
{
/** @var ImportJobRepositoryInterface */
public $repository;

9
app/Http/Controllers/Import/PrerequisitesController.php
View File

@@ -52,6 +52,8 @@ class PrerequisitesController extends Controller
app('view')->share('mainTitleIcon', 'fa-archive');
app('view')->share('title', trans('firefly.import_index_title'));
app('view')->share('subTitleIcon', 'fa-check');
$this->repository = app(ImportJobRepositoryInterface::class);
return $next($request);
@@ -73,6 +75,7 @@ class PrerequisitesController extends Controller
*/
public function index(string $importProvider, ImportJob $importJob = null)
{
app('view')->share('subTitle', trans('import.prerequisites_breadcrumb_' . $importProvider));
$class = (string)config(sprintf('import.prerequisites.%s', $importProvider));
if (!class_exists($class)) {
throw new FireflyException(sprintf('No class to handle configuration for "%s".', $importProvider)); // @codeCoverageIgnore
@@ -134,7 +137,7 @@ class PrerequisitesController extends Controller
}
// session flash!
$request->session()->flash('success', (string)trans('firefly.prerequisites_saved_for_' . $importProvider));
$request->session()->flash('success', (string)trans('import.prerequisites_saved_for_' . $importProvider));
// if has job, redirect to global config for provider
// if no job, back to index!
@@ -142,8 +145,8 @@ class PrerequisitesController extends Controller
return redirect(route('import.index'));
}
// redirect to global config:
return redirect(route('import.index'));
// redirect to job config:
return redirect(route('import.job.configuration.index', [$importJob->key]));
}