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

Rename to settings

Browse Source
This commit is contained in:
James Cole
2025-01-18 17:20:21 +01:00
parent d178ff9de0
commit 23d70a2fac
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/ConfigurationController.php
View File

@@ -45,7 +45,7 @@ class ConfigurationController extends Controller
$this->middleware( $this->middleware(
static function ($request, $next) { static function ($request, $next) {
app('view')->share('title', (string) trans('firefly.administration')); app('view')->share('title', (string) trans('firefly.system_settings'));
app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
return $next($request); return $next($request);
@@ -73,7 +73,7 @@ class ConfigurationController extends Controller
$siteOwner = config('firefly.site_owner'); $siteOwner = config('firefly.site_owner');
return view( return view(
'admin.configuration.index', 'settings.configuration.index',
compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner') compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
); );
} }
@@ -96,6 +96,6 @@ class ConfigurationController extends Controller
session()->flash('success', (string) trans('firefly.configuration_updated')); session()->flash('success', (string) trans('firefly.configuration_updated'));
app('preferences')->mark(); app('preferences')->mark();
return redirect()->route('admin.configuration.index'); return redirect()->route('settings.configuration.index');
} }
} }

10
app/Http/Controllers/Admin/LinkController.php
View File

@@ -51,7 +51,7 @@ class LinkController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.administration')); app('view')->share('title', (string) trans('firefly.system_settings'));
app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
$this->repository = app(LinkTypeRepositoryInterface::class); $this->repository = app(LinkTypeRepositoryInterface::class);
@@ -91,7 +91,7 @@ class LinkController extends Controller
if (false === $linkType->editable) { if (false === $linkType->editable) {
$request->session()->flash('error', (string) trans('firefly.cannot_edit_link_type', ['name' => e($linkType->name)])); $request->session()->flash('error', (string) trans('firefly.cannot_edit_link_type', ['name' => e($linkType->name)]));
return redirect(route('admin.links.index')); return redirect(route('settings.links.index'));
} }
Log::channel('audit')->info(sprintf('User wants to delete link type #%d', $linkType->id)); Log::channel('audit')->info(sprintf('User wants to delete link type #%d', $linkType->id));
@@ -142,7 +142,7 @@ class LinkController extends Controller
if (false === $linkType->editable) { if (false === $linkType->editable) {
$request->session()->flash('error', (string) trans('firefly.cannot_edit_link_type', ['name' => e($linkType->name)])); $request->session()->flash('error', (string) trans('firefly.cannot_edit_link_type', ['name' => e($linkType->name)]));
return redirect(route('admin.links.index')); return redirect(route('settings.links.index'));
} }
$subTitle = (string) trans('firefly.edit_link_type', ['name' => $linkType->name]); $subTitle = (string) trans('firefly.edit_link_type', ['name' => $linkType->name]);
$subTitleIcon = 'fa-link'; $subTitleIcon = 'fa-link';
@@ -217,7 +217,7 @@ class LinkController extends Controller
// set value so create routine will not overwrite URL: // set value so create routine will not overwrite URL:
$request->session()->put('link-types.create.fromStore', true); $request->session()->put('link-types.create.fromStore', true);
$redirect = redirect(route('admin.links.create'))->withInput(); $redirect = redirect(route('settings.links.create'))->withInput();
} }
// redirect to previous URL. // redirect to previous URL.
@@ -234,7 +234,7 @@ class LinkController extends Controller
if (false === $linkType->editable) { if (false === $linkType->editable) {
$request->session()->flash('error', (string) trans('firefly.cannot_edit_link_type', ['name' => e($linkType->name)])); $request->session()->flash('error', (string) trans('firefly.cannot_edit_link_type', ['name' => e($linkType->name)]));
return redirect(route('admin.links.index')); return redirect(route('settings.links.index'));
} }
$data = [ $data = [

6
app/Http/Controllers/Admin/NotificationController.php
View File

@@ -38,7 +38,7 @@ class NotificationController extends Controller
public function index(): View public function index(): View
{ {
Log::channel('audit')->info('User visits notifications index.'); Log::channel('audit')->info('User visits notifications index.');
$title = (string) trans('firefly.administration'); $title = (string) trans('firefly.system_settings');
$mainTitleIcon = 'fa-hand-spock-o'; $mainTitleIcon = 'fa-hand-spock-o';
$subTitle = (string) trans('firefly.title_owner_notifications'); $subTitle = (string) trans('firefly.title_owner_notifications');
$subTitleIcon = 'envelope-o'; $subTitleIcon = 'envelope-o';
@@ -115,7 +115,7 @@ class NotificationController extends Controller
session()->flash('success', (string) trans('firefly.notification_settings_saved')); session()->flash('success', (string) trans('firefly.notification_settings_saved'));
return redirect(route('admin.notification.index')); return redirect(route('settings.notification.index'));
} }
public function testNotification(Request $request): RedirectResponse public function testNotification(Request $request): RedirectResponse
@@ -140,6 +140,6 @@ class NotificationController extends Controller
session()->flash('success', (string) trans('firefly.notification_test_executed', ['channel' => $channel])); session()->flash('success', (string) trans('firefly.notification_test_executed', ['channel' => $channel]));
} }
return redirect(route('admin.notification.index')); return redirect(route('settings.notification.index'));
} }
} }

6
app/Http/Controllers/Admin/UpdateController.php
View File

@@ -47,7 +47,7 @@ class UpdateController extends Controller
parent::__construct(); parent::__construct();
$this->middleware( $this->middleware(
static function ($request, $next) { static function ($request, $next) {
app('view')->share('title', (string) trans('firefly.administration')); app('view')->share('title', (string) trans('firefly.system_settings'));
app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
return $next($request); return $next($request);
@@ -100,7 +100,7 @@ class UpdateController extends Controller
app('fireflyconfig')->set('update_channel', $channel); app('fireflyconfig')->set('update_channel', $channel);
session()->flash('success', (string) trans('firefly.configuration_updated')); session()->flash('success', (string) trans('firefly.configuration_updated'));
return redirect(route('admin.update-check')); return redirect(route('settings.update-check'));
} }
/** /**
@@ -112,6 +112,6 @@ class UpdateController extends Controller
session()->flash($release['level'], $release['message']); session()->flash($release['level'], $release['message']);
return redirect(route('admin.update-check')); return redirect(route('settings.update-check'));
} }
} }

16
app/Http/Controllers/Admin/UserController.php
View File

@@ -55,7 +55,7 @@ class UserController extends Controller
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
app('view')->share('title', (string) trans('firefly.administration')); app('view')->share('title', (string) trans('firefly.system_settings'));
app('view')->share('mainTitleIcon', 'fa-hand-spock-o'); app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
$this->repository = app(UserRepositoryInterface::class); $this->repository = app(UserRepositoryInterface::class);
@@ -74,12 +74,12 @@ class UserController extends Controller
if ($this->externalIdentity) { if ($this->externalIdentity) {
request()->session()->flash('error', trans('firefly.external_user_mgt_disabled')); request()->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
return redirect(route('admin.users')); return redirect(route('settings.users'));
} }
$subTitle = (string) trans('firefly.delete_user', ['email' => $user->email]); $subTitle = (string) trans('firefly.delete_user', ['email' => $user->email]);
return view('admin.users.delete', compact('user', 'subTitle')); return view('settings.users.delete', compact('user', 'subTitle'));
} }
public function deleteInvite(InvitedUser $invitedUser): JsonResponse public function deleteInvite(InvitedUser $invitedUser): JsonResponse
@@ -108,12 +108,12 @@ class UserController extends Controller
if ($this->externalIdentity) { if ($this->externalIdentity) {
request()->session()->flash('error', trans('firefly.external_user_mgt_disabled')); request()->session()->flash('error', trans('firefly.external_user_mgt_disabled'));
return redirect(route('admin.users')); return redirect(route('settings.users'));
} }
$this->repository->destroy($user); $this->repository->destroy($user);
session()->flash('success', (string) trans('firefly.user_deleted')); session()->flash('success', (string) trans('firefly.user_deleted'));
return redirect(route('admin.users')); return redirect(route('settings.users'));
} }
/** /**
@@ -186,7 +186,7 @@ class UserController extends Controller
// event! // event!
event(new InvitationCreated($invitee)); event(new InvitationCreated($invitee));
return redirect(route('admin.users')); return redirect(route('settings.users'));
} }
/** /**
@@ -196,7 +196,7 @@ class UserController extends Controller
*/ */
public function show(User $user) public function show(User $user)
{ {
$title = (string) trans('firefly.administration'); $title = (string) trans('firefly.system_settings');
$mainTitleIcon = 'fa-hand-spock-o'; $mainTitleIcon = 'fa-hand-spock-o';
$subTitle = (string) trans('firefly.single_user_administration', ['email' => $user->email]); $subTitle = (string) trans('firefly.single_user_administration', ['email' => $user->email]);
$subTitleIcon = 'fa-user'; $subTitleIcon = 'fa-user';
@@ -248,7 +248,7 @@ class UserController extends Controller
if (1 === (int) $request->get('return_to_edit')) { if (1 === (int) $request->get('return_to_edit')) {
session()->put('users.edit.fromUpdate', true); session()->put('users.edit.fromUpdate', true);
$redirect = redirect(route('admin.users.edit', [$user->id]))->withInput(['return_to_edit' => 1]); $redirect = redirect(route('settings.users.edit', [$user->id]))->withInput(['return_to_edit' => 1]);
} }
// redirect to previous URL. // redirect to previous URL.