diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 6bfe4159cf..2d4dc8bff7 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -51,7 +51,7 @@ class HomeController extends Controller public function index() { Log::channel('audit')->info('User visits admin index.'); - $title = (string) trans('firefly.administration'); + $title = (string) trans('firefly.system_settings'); $mainTitleIcon = 'fa-hand-spock-o'; $email = auth()->user()->email; $pref = app('preferences')->get('remote_guard_alt_email'); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index f2c3a02362..8d723780fc 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -301,7 +301,7 @@ return [ 'update_check_title' => 'Check for updates', 'admin_update_check_title' => 'Automatically check for update', 'admin_update_check_explain' => 'Firefly III can check for updates automatically. When you enable this setting, it will contact the Firefly III update server to see if a new version of Firefly III is available. When it is, you will get a notification. You can test this notification using the button on the right. Please indicate below if you want Firefly III to check for updates.', - 'check_for_updates_permission' => 'Firefly III can check for updates, but it needs your permission to do so. Please go to the administration to indicate if you would like this feature to be enabled.', + 'check_for_updates_permission' => 'Firefly III can check for updates, but it needs your permission to do so. Please go to the settings to indicate if you would like this feature to be enabled.', 'updates_ask_me_later' => 'Ask me later', 'updates_do_not_check' => 'Do not check for updates', 'updates_enable_check' => 'Enable the check for updates', @@ -1606,7 +1606,7 @@ return [ 'regenerate_command_line_token' => 'Regenerate command line token', 'token_regenerated' => 'A new command line token was generated', 'change_your_email' => 'Change your email address', - 'email_verification' => 'An email message will be sent to your old AND new email address. For security purposes, you will not be able to login until you verify your new email address. If you are unsure if your Firefly III installation is capable of sending email, please do not use this feature. If you are an administrator, you can test this in the Administration.', + 'email_verification' => 'An email message will be sent to your old AND new email address. For security purposes, you will not be able to login until you verify your new email address. If you are unsure if your Firefly III installation is capable of sending email, please do not use this feature. If you are an administrator, you can test this in the settings.', 'email_changed_logout' => 'Until you verify your email address, you cannot login.', 'login_with_new_email' => 'You can now login with your new email address.', 'login_with_old_email' => 'You can now login with your old email address again.', @@ -2528,7 +2528,7 @@ return [ 'invite_is_already_redeemed' => 'The invite to ":address" has already been redeemed.', 'invite_is_deleted' => 'The invite to ":address" has been deleted.', 'invite_new_user_title' => 'Invite new user', - 'invite_new_user_text' => 'As an administrator, you can invite users to register on your Firefly III administration. Using the direct link you can share with them, they will be able to register an account. The invited user and their invite link will appear in the table below. You are free to share the invitation link with them.', + 'invite_new_user_text' => 'As an administrator, you can invite users to register to your Firefly III installation. Using the direct link you can share with them, they will be able to register an account. The invited user and their invite link will appear in the table below. You are free to share the invitation link with them.', 'invited_user_mail' => 'Email address', 'invite_user' => 'Invite user', 'user_is_invited' => 'Email address ":address" was invited to Firefly III', @@ -2539,7 +2539,7 @@ return [ 'list_all_users' => 'All users', 'all_users' => 'All users', 'instance_configuration' => 'Configuration', - 'firefly_instance_configuration' => 'Configuration options for Firefly III', + 'firefly_instance_configuration' => 'Firefly III configuration', 'setting_single_user_mode' => 'Single user mode', 'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as well, assuming they can reach it (when it is connected to the internet).', 'store_configuration' => 'Store configuration', @@ -2634,7 +2634,7 @@ return [ 'do_not_save_connection' => '(do not save connection)', 'link_transaction' => 'Link transaction', 'link_to_other_transaction' => 'Link this transaction to another transaction', - 'select_transaction_to_link' => 'Select a transaction to link this transaction to. The links are currently unused in Firefly III (apart from being shown), but I plan to change this in the future. Use the search box to select a transaction either by title or by ID. If you want to add custom link types, check out the administration section.', + 'select_transaction_to_link' => 'Select a transaction to link this transaction to. The links are currently unused in Firefly III (apart from being shown), but I plan to change this in the future. Use the search box to select a transaction either by title or by ID. If you want to add custom link types, check out the settings.', 'this_transaction' => 'This transaction', 'transaction' => 'Transaction', 'comments' => 'Comments', diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig index c418c0f273..c12dd19276 100644 --- a/resources/views/admin/index.twig +++ b/resources/views/admin/index.twig @@ -33,24 +33,6 @@
-
-
-

{{ 'send_test_email'|_ }}

-
-
- -
-

- {{ trans('firefly.send_test_email_text', {email:email})|raw }} -

-
-
- -
-
-

{{ 'admin_maintanance_title'|_ }}

diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 6d3c3b8bee..53b6e095a0 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -175,7 +175,7 @@ Breadcrumbs::for( 'admin.index', static function (Generator $breadcrumbs): void { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.administration'), route('admin.index')); + $breadcrumbs->push(trans('firefly.system_settings'), route('admin.index')); } ); diff --git a/routes/web.php b/routes/web.php index d977b3586d..0089a309da 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1369,7 +1369,7 @@ Route::group( // For the admin routes, the user must be logged in and have the role of 'owner'. Route::group( - ['middleware' => 'admin', 'namespace' => 'FireflyIII\Http\Controllers\Admin', 'prefix' => 'admin', 'as' => 'admin.'], + ['middleware' => 'admin', 'namespace' => 'FireflyIII\Http\Controllers\Admin', 'prefix' => 'settings', 'as' => 'admin.'], static function (): void { // admin home Route::get('', ['uses' => 'HomeController@index', 'as' => 'index']);