refacotr: Follow core development

Author: bkader

language/english/admin/core_lang.php

@@ -18,7 +18,7 @@
 $lang['admin_content'] = 'Content';
 $lang['admin_database_backup'] = 'Database Backups';
 $lang['admin_extensions'] = 'Extensions';
-$lang['admin_footer_left'] = 'Thank you for creating with <a href="%s" target="_blank">%s</a>.';
+$lang['admin_footer_left'] = 'Thank you for creating with <a href="%s" target="_blank" rel="nofollow noopener">%s</a>.';
 $lang['admin_footer_right'] = 'Version: <b>%s</b>';
 $lang['admin_help'] = 'Help';
 $lang['admin_logs'] = 'System Logs';
@@ -28,7 +28,7 @@
 $lang['admin_reports'] = 'Activity Log';
 $lang['admin_system'] = 'System';
 $lang['admin_themes'] = 'Themes';
-$lang['admin_update_notice'] = '<a href="%2$s" target="_blank">Version <b>%1$s</b> is now available!</a>';
+$lang['admin_update_notice'] = '<a href="%2$s" target="_blank" rel="nofollow noopener">Version <b>%1$s</b> is now available!</a>';
 $lang['admin_users'] = 'Users';
 $lang['admin_view_site'] = 'View Site';
 $lang['settings_global'] = 'Global Settings';
@@ -122,13 +122,13 @@
 $lang['base_controller'] = 'Base Controller';
 $lang['base_controller_tip'] = 'The controller used as your default homepage.';
 $lang['contact_email'] = 'Contact Email';
-$lang['contact_email_tip'] = 'The email address to which contact form messages are sent.';
+$lang['contact_email_tip'] = 'Public email address visitors can use to reach you.';
 $lang['date_format'] = 'Date Format';
 $lang['date_format_tip'] = 'Choose the date format you want to use.';
 $lang['demo_mode'] = 'Demo Mode';
 $lang['demo_mode_tip'] = 'Choose whether to put the site on demo-mode.';
 $lang['discord_auth'] = 'Login with Discord';
-$lang['discord_auth_tip'] = 'Allow users to log in with <a href="https://discord.com/developers" target="_blank">Discord</a>.';
+$lang['discord_auth_tip'] = 'Allow users to log in with <a href="https://discord.com/developers" target="_blank" rel="nofollow noopener">Discord</a>.';
 $lang['discord_client_id'] = 'Client ID';
 $lang['discord_client_id_tip'] = 'Enter your Discord application client ID.';
 $lang['discord_client_secret'] = 'Client Secret';
@@ -143,19 +143,19 @@
 $lang['facebook_app_secret'] = 'Client Secret';
 $lang['facebook_app_secret_tip'] = 'Enter your Facebook application secret key.';
 $lang['facebook_auth'] = 'Login with Facebook';
-$lang['facebook_auth_tip'] = 'Allow users to log in with <a href="https://developers.facebook.com/apps/" target="_blank">Facebook</a>.';
+$lang['facebook_auth_tip'] = 'Allow users to log in with <a href="https://developers.facebook.com/apps/" target="_blank" rel="nofollow noopener">Facebook</a>.';
 $lang['facebook_pixel_id'] = 'Facebook Pixel ID';
 $lang['facebook_pixel_id_tip'] = 'Your Facebook Pixel ID. Used to track visits and conversions. You can find it in Events Manager under your pixel\'s settings.';
 $lang['github_auth'] = 'Login with GitHub';
-$lang['github_auth_tip'] = 'Allow users to log in with <a href="https://github.com/" target="_blank">GitHub</a>.';
+$lang['github_auth_tip'] = 'Allow users to log in with <a href="https://github.com/" target="_blank" rel="nofollow noopener">GitHub</a>.';
 $lang['github_client_id'] = 'Client ID';
 $lang['github_client_id_tip'] = 'Enter your GitHub application client ID.';
 $lang['github_client_secret'] = 'Client Secret';
 $lang['github_client_secret_tip'] = 'Enter your GitHub application secret key.';
 $lang['google_analytics_id'] = 'Google Analytics ID';
 $lang['google_analytics_id_tip'] = 'Enter your Google Analytics Tracking ID.';
 $lang['google_auth'] = 'Login with Google';
-$lang['google_auth_tip'] = 'Allow users to log in with <a href="https://console.cloud.google.com/" target="_blank">Google</a>.';
+$lang['google_auth_tip'] = 'Allow users to log in with <a href="https://console.cloud.google.com/" target="_blank" rel="nofollow noopener">Google</a>.';
 $lang['google_client_id'] = 'Client ID';
 $lang['google_client_id_tip'] = 'Enter your Google application client ID.';
 $lang['google_client_secret'] = 'Client Secret';
@@ -171,7 +171,7 @@
 $lang['imgur_client_secret'] = 'Client Secret';
 $lang['imgur_client_secret_tip'] = 'Enter your Imgur application secret key.';
 $lang['linkedin_auth'] = 'Login with LinkedIn';
-$lang['linkedin_auth_tip'] = 'Allow users to log in with <a href="https://developer.linkedin.com/" target="_blank">LinkedIn</a>.';
+$lang['linkedin_auth_tip'] = 'Allow users to log in with <a href="https://developer.linkedin.com/" target="_blank" rel="nofollow noopener">LinkedIn</a>.';
 $lang['linkedin_client_id'] = 'Client ID';
 $lang['linkedin_client_id_tip'] = 'Enter your LinkedIn application client ID.';
 $lang['linkedin_client_secret'] = 'Client Secret';
@@ -206,10 +206,11 @@
 $lang['offline_access_level_tip'] = 'The minimum level capable to login while in maintenance mode.';
 $lang['per_page'] = 'Per Page';
 $lang['per_page_tip'] = 'How many items are shown on pages using pagination?';
-$lang['recaptcha_private_key'] = 'Private reCAPTCHA Key';
-$lang['recaptcha_private_key_tip'] = 'Enter the reCAPTCHA private key provided by Google.';
-$lang['recaptcha_site_key'] = 'Site reCAPTCHA Key';
-$lang['recaptcha_site_key_tip'] = 'Enter the reCAPTCHA site key provided by Google.';
+$lang['pwa'] = 'PWA';
+$lang['recaptcha_secret_key'] = 'reCAPTCHA Secret Key';
+$lang['recaptcha_secret_key_tip'] = 'Enter your reCAPTCHA secret key provided by Google.';
+$lang['recaptcha_site_key'] = 'reCAPTCHA Site Key';
+$lang['recaptcha_site_key_tip'] = 'Enter your reCAPTCHA site key provided by Google.';
 $lang['sendmail_path'] = 'Sendmail Path';
 $lang['sendmail_path_tip'] = 'Enter the sendmail path. Default: /usr/sbin/sendmail. Required only if using the Sendmail protocol.';
 $lang['server_email'] = 'Server Email';
@@ -263,17 +264,16 @@
 $lang['upload_path_tip'] = 'The path where different allowed files are uploaded to. Default: content/uploads/';
 $lang['upload_year_month'] = 'Year/Month based folders';
 $lang['upload_year_month_tip'] = 'Organize uploads into year/month based folders.';
-$lang['use_captcha'] = 'Use captcha';
-$lang['use_captcha_tip'] = 'Whether to enable Captcha on some site forms.';
+$lang['use_captcha'] = 'Enable CAPTCHA';
+$lang['use_captcha_tip'] = 'Whether to enable CAPTCHA on some site forms.';
 $lang['use_gravatar'] = 'Use Gravatar';
 $lang['use_gravatar_tip'] = 'Use Gravatar or allow users to upload their avatars.';
 $lang['use_imgur'] = 'Upload to Imgur.com';
-$lang['use_imgur_tip'] = 'Upload your images to Imgur instead (<a href="https://api.imgur.com/oauth2/addclient" target="_blank">Requires App</a>).';
+$lang['use_imgur_tip'] = 'Upload your images to Imgur instead (<a href="https://api.imgur.com/oauth2/addclient" target="_blank" rel="nofollow noopener">Requires App</a>).';
 $lang['use_manifest'] = 'Enable Progressive Web App';
 $lang['use_manifest_tip'] = 'A "manifest.json" file is a JSON file that provides metadata about a site or web application, primarily to enhance how the site behaves on mobile devices and how it can be added to the user\'s home screen as a Progressive Web App (PWA).';
 $lang['use_recaptcha'] = 'Use reCAPTCHA';
-$lang['use_recaptcha_tip'] = 'Use Google reCAPTCHA if enabled, or use CiSkeleton\'s built-in captcha if Use captcha is set to Yes.';
-$lang['pwa'] = 'PWA';
+$lang['use_recaptcha_tip'] = 'Whether to use Google reCAPTCHA. Requires valid site and secret keys, and CAPTCHA to be enabled.';
 
 // System Information
 $lang['sysinfo_database_type'] = 'Database Type';

language/english/core_lang.php

@@ -70,8 +70,8 @@
 $lang['banned'] = 'Banned';
 $lang['both'] = 'Both';
 $lang['cancel'] = 'Cancel';
-$lang['cannot_display_download'] = 'Unable to display file. <a href="%s" target="_blank">Download</a> instead.';
-$lang['captcha'] = 'Captcha';
+$lang['cannot_display_download'] = 'Unable to display file. <a href="%s" target="_blank" rel="nofollow noopener">Download</a> instead.';
+$lang['captcha'] = 'CAPTCHA';
 $lang['check_inbox_or_spam'] = 'Check your inbox or spam.';
 $lang['city'] = 'City';
 $lang['click_here'] = 'Click Here';
@@ -80,8 +80,6 @@
 $lang['company'] = 'Company';
 $lang['confirm'] = 'Confirm';
 $lang['confirm_password'] = 'Confirm password';
-$lang['contact'] = 'Contact';
-$lang['contact_us'] = 'Contact Us';
 $lang['content'] = 'Content';
 $lang['cookie_consent'] = 'We use cookies to understand how visitors interact with our website and to improve its functionality.';
 $lang['copy'] = 'Copy';
@@ -144,7 +142,6 @@
 $lang['error_404'] = 'Whoops! Sorry but...';
 $lang['error_404_body'] = 'We cannot find the page you\'re looking for.';
 $lang['error_404_uri'] = 'Error 404 (Not Found) !! %s';
-$lang['error_captcha'] = 'The captcha code you entered is incorrect.';
 $lang['error_component_disabled'] = 'This component is disabled. Enable it on the dashboard in order to use it.';
 $lang['error_csrf'] = 'This action did not pass our security controls.';
 $lang['error_logged_in'] = 'You are already logged in.';
@@ -272,7 +269,7 @@
 $lang['plugin'] = 'Plugin';
 $lang['popular'] = 'Popular';
 $lang['powered_by'] = 'Powered by %s';
-$lang['powered_by_url'] = 'Powered by <a href="%2$s" target="_blank">%1$s</a>';
+$lang['powered_by_url'] = 'Powered by <a href="%2$s" target="_blank" rel="nofollow noopener">%1$s</a>';
 $lang['premium'] = 'Premium';
 $lang['prev'] = 'Prev.';
 $lang['preview'] = 'Preview';

language/english/form_validation_lang.php

@@ -47,3 +47,5 @@
 $lang['form_validation_exact_words'] = 'The {field} field must contain exactly {param} words.';
 $lang['form_validation_alpha_dash_space'] = 'The {field} field may only contain alpha-numeric characters, underscores, dashes, and spaces.';
 $lang['form_validation_strong_password'] = 'For your safety, please choose a stronger password.';
+$lang['form_validation_valid_captcha'] = 'The CAPTCHA code you entered is incorrect.';
+$lang['form_validation_valid_recaptcha'] = 'Please confirm that you are not a robot.';