gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cast all translations to strings.

Browse Source
This commit is contained in:
James Cole
2018-07-15 09:38:49 +02:00
parent 369839e012
commit 7b41c5b301
99 changed files with 335 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/CategoryController.php
View File

@@ -46,7 +46,7 @@ class CategoryController extends Controller
$this->middleware(
function ($request, $next) {
app('view')->share('title', trans('firefly.categories'));
app('view')->share('title', (string)trans('firefly.categories'));
app('view')->share('mainTitleIcon', 'fa-bar-chart');
$this->repository = app(CategoryRepositoryInterface::class);
@@ -66,7 +66,7 @@ class CategoryController extends Controller
$this->rememberPreviousUri('categories.create.uri');
}
$request->session()->forget('categories.create.fromStore');
$subTitle = trans('firefly.create_new_category');
$subTitle =(string)trans('firefly.create_new_category');
return view('categories.create', compact('subTitle'));
}
@@ -78,7 +78,7 @@ class CategoryController extends Controller
*/
public function delete(Category $category)
{
$subTitle = trans('firefly.delete_category', ['name' => $category->name]);
$subTitle = (string)trans('firefly.delete_category', ['name' => $category->name]);
// put previous url in session
$this->rememberPreviousUri('categories.delete.uri');
@@ -111,7 +111,7 @@ class CategoryController extends Controller
*/
public function edit(Request $request, Category $category)
{
$subTitle = trans('firefly.edit_category', ['name' => $category->name]);
$subTitle = (string)trans('firefly.edit_category', ['name' => $category->name]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('categories.edit.fromUpdate')) {