From e9be2b7174207f5f52303184aafadfefa9277a35 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sat, 16 Feb 2019 15:39:23 +0000 Subject: [PATCH] Standardized setting casing --- resources/lang/en/settings.php | 24 +++++++++++++----------- resources/views/settings/index.blade.php | 4 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 8b18ad736..3b9da1ac6 100755 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -14,40 +14,42 @@ return [ // App Settings 'app_customization' => 'Customization', 'app_features_security' => 'Features & Security', - 'app_name' => 'Application name', + 'app_name' => 'Application Name', 'app_name_desc' => 'This name is shown in the header and in any system-sent emails.', 'app_name_header' => 'Show name in header', - 'app_public_access' => 'Public access', + 'app_public_access' => 'Public Access', 'app_public_access_desc' => 'Enabling this option will allow visitors, that are not logged-in, to access content in your BookStack instance.', 'app_public_access_desc_guest' => 'Access for public visitors can be controlled through the "Guest" user.', 'app_public_access_toggle' => 'Allow public access', 'app_public_viewing' => 'Allow public viewing?', - 'app_secure_images' => 'Higher security image uploads', + 'app_secure_images' => 'Higher Security Image Uploads', 'app_secure_images_toggle' => 'Enable higher security image uploads', 'app_secure_images_desc' => 'For performance reasons, all images are public. This option adds a random, hard-to-guess string in front of image urls. Ensure directory indexes are not enabled to prevent easy access.', - 'app_editor' => 'Page editor', + 'app_editor' => 'Page Editor', 'app_editor_desc' => 'Select which editor will be used by all users to edit pages.', - 'app_custom_html' => 'Custom HTML head content', + 'app_custom_html' => 'Custom HTML Head Content', 'app_custom_html_desc' => 'Any content added here will be inserted into the bottom of the section of every page. This is handy for overriding styles or adding analytics code.', - 'app_logo' => 'Application logo', + 'app_logo' => 'Application Logo', 'app_logo_desc' => 'This image should be 43px in height.
Large images will be scaled down.', - 'app_primary_color' => 'Application primary color', + 'app_primary_color' => 'Application Primary Color', 'app_primary_color_desc' => 'This should be a hex value.
Leave empty to reset to the default color.', 'app_homepage' => 'Application Homepage', 'app_homepage_desc' => 'Select a view to show on the homepage instead of the default view. Page permissions are ignored for selected pages.', 'app_homepage_select' => 'Select a page', - 'app_disable_comments' => 'Disable comments', + 'app_disable_comments' => 'Disable Comments', + 'app_disable_comments_toggle' => 'Disable comments', 'app_disable_comments_desc' => 'Disables comments across all pages in the application.
Existing comments are not shown.', // Registration Settings 'reg_settings' => 'Registration', - 'reg_enable' => 'Enable registration', + 'reg_enable' => 'Enable Registration', + 'reg_enable_toggle' => 'Enable registration', 'reg_enable_desc' => 'When registration is enabled user will be able to sign themselves up as an application user. Upon registration they are given a single, default user role.', 'reg_default_role' => 'Default user role after registration', - 'reg_email_confirmation' => 'Email confirmation', + 'reg_email_confirmation' => 'Email Confirmation', 'reg_email_confirmation_toggle' => 'Require email confirmation', 'reg_confirm_email_desc' => 'If domain restriction is used then email confirmation will be required and this option will be ignored.', - 'reg_confirm_restrict_domain' => 'Restrict registration to domain', + 'reg_confirm_restrict_domain' => 'Domain Restriction', 'reg_confirm_restrict_domain_desc' => 'Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application.
Note that users will be able to change their email addresses after successful registration.', 'reg_confirm_restrict_domain_placeholder' => 'No restriction set', diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 54d27ea95..d063539ea 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -63,7 +63,7 @@ @include('components.toggle-switch', [ 'name' => 'setting-app-disable-comments', 'value' => setting('app-disable-comments'), - 'label' => trans('settings.app_disable_comments'), + 'label' => trans('settings.app_disable_comments_toggle'), ]) @@ -192,7 +192,7 @@ @include('components.toggle-switch', [ 'name' => 'setting-registration-enabled', 'value' => setting('registration-enabled'), - 'label' => trans('settings.reg_enable') + 'label' => trans('settings.reg_enable_toggle') ])