From fcd5e83109ced1bf3c7942786e0ecfec0c187197 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Fri, 5 Feb 2021 16:20:35 +0100 Subject: [PATCH] Consistently use "Attention" in English texts See #3801 --- .../files/lib/system/file/upload/UploadField.class.php | 6 +++--- .../files/lib/system/file/upload/UploadHandler.class.php | 4 ++-- .../system/form/builder/field/UploadFormField.class.php | 6 +++--- wcfsetup/install/files/lib/util/UserAgent.class.php | 4 ++-- wcfsetup/install/files/style/layout/grid.scss | 2 +- wcfsetup/install/lang/en.xml | 8 ++++---- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wcfsetup/install/files/lib/system/file/upload/UploadField.class.php b/wcfsetup/install/files/lib/system/file/upload/UploadField.class.php index c2803aed97..3b4136c71a 100644 --- a/wcfsetup/install/files/lib/system/file/upload/UploadField.class.php +++ b/wcfsetup/install/files/lib/system/file/upload/UploadField.class.php @@ -39,7 +39,7 @@ class UploadField /** * This flag indicates whether only images can uploaded via this field. - * Heads up: SVG images can contain bad code, therefore do not + * Attention: SVG images can contain bad code, therefore do not * use this option, outside the acp or check the file whether remote code is contained. * @var bool */ @@ -162,7 +162,7 @@ class UploadField * image only (if this field is not image only, this method will * throw an exception). * - * Heads up: SVG images can contain bad code, therefore do not + * Attention: SVG images can contain bad code, therefore do not * use this option, outside the acp or check the file whether remote code is contained. * * @param bool $allowSvgImage @@ -183,7 +183,7 @@ class UploadField /** * Specifies acceptable file types. Use null to not specify any restrictions. * - * Heads up: This feature is used to improve user experience, by removing + * Attention: This feature is used to improve user experience, by removing * unacceptable files from the file picker. It does not validate the type of the uploaded * file. You are responsible to perform (proper) validation on the server side. * diff --git a/wcfsetup/install/files/lib/system/file/upload/UploadHandler.class.php b/wcfsetup/install/files/lib/system/file/upload/UploadHandler.class.php index bb72e0b02c..5cb9469079 100644 --- a/wcfsetup/install/files/lib/system/file/upload/UploadHandler.class.php +++ b/wcfsetup/install/files/lib/system/file/upload/UploadHandler.class.php @@ -293,7 +293,7 @@ class UploadHandler extends SingletonFactory /** * Registers files for the given internalId. * - * HEADS UP: Deletes all uploaded files and overwrites them with + * Attention: Deletes all uploaded files and overwrites them with * the given files. If you want to add a file, use the addFileForInternalId method. * * @param string $internalId @@ -333,7 +333,7 @@ class UploadHandler extends SingletonFactory /** * Register files for the field with the given fieldId. * - * HEADS UP: Deletes all uploaded files and overwrites them with + * Attention: Deletes all uploaded files and overwrites them with * the given files. If you want to add a file, use the addFileForField method. * * @param string $fieldId diff --git a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php index cb74c6491b..eff7e00eb7 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/UploadFormField.class.php @@ -34,7 +34,7 @@ class UploadFormField extends AbstractFormField /** * This flag indicates whether only images can uploaded via this field. - * Heads up: SVG images can contain bad code, therefore do not + * Attention: SVG images can contain bad code, therefore do not * use this option, outside the acp or check the file whether remote code is contained. * @var bool */ @@ -723,7 +723,7 @@ class UploadFormField extends AbstractFormField * image only (if this field is not image only, this method will * throw an exception). * - * Heads up: SVG images can contain bad code, therefore do not + * Attention: SVG images can contain bad code, therefore do not * use this option, outside the acp or check the file whether remote code is contained. * * @param bool $allowSvgImages @@ -767,7 +767,7 @@ class UploadFormField extends AbstractFormField /** * Specifies acceptable file types. Use null to not specify any restrictions. * - * Heads up: This feature is used to improve user experience, by removing + * Attention: This feature is used to improve user experience, by removing * unacceptable files from the file picker. It does not validate the type of the uploaded * file. You are responsible to perform (proper) validation on the server side. * diff --git a/wcfsetup/install/files/lib/util/UserAgent.class.php b/wcfsetup/install/files/lib/util/UserAgent.class.php index 2b9f9fc146..b54cd6740e 100644 --- a/wcfsetup/install/files/lib/util/UserAgent.class.php +++ b/wcfsetup/install/files/lib/util/UserAgent.class.php @@ -427,7 +427,7 @@ class UserAgent /** * Checks if the User Agent gives an indicator about a tablet device. - * Heads up: This is only a basic test and can easily be falsified by the user. + * Attention: This is only a basic test and can easily be falsified by the user. */ public function isTablet(): bool { @@ -440,7 +440,7 @@ class UserAgent /** * Checks if the User Agent gives an indicator about a mobile device. - * Heads up: This is only a basic test and can easily be falsified by the user. + * Attention: This is only a basic test and can easily be falsified by the user. */ public function isMobileBrowser(): bool { diff --git a/wcfsetup/install/files/style/layout/grid.scss b/wcfsetup/install/files/style/layout/grid.scss index 565be7ba9f..19a87d642f 100644 --- a/wcfsetup/install/files/style/layout/grid.scss +++ b/wcfsetup/install/files/style/layout/grid.scss @@ -5,7 +5,7 @@ */ /* - * Heads up! This is a modified version containing only the sizes + * Attention: This is a modified version containing only the sizes * "xs" (mobile) and "md" (desktop). Additionally the "push", "pull", * "first" and "last" classes have been left out. */ diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 1ce135999c..c9ac9e208f 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -145,7 +145,7 @@ - Heads up! You must not set this option for inline elements such as bold or links.]]> + Attention: You must not set this option for inline elements such as bold or links.]]> @@ -3160,7 +3160,7 @@ Your account on the website: {@PAGE_TITLE|language} [URL:{link isEmail=true}{/li - + Attention: The bulk processing executes all actions below on all users matching the selected conditions without any further confirmation prompt!]]> @@ -3174,7 +3174,7 @@ Your account on the website: {@PAGE_TITLE|language} [URL:{link isEmail=true}{/li {$user->username}. The user will need to setup up multi-factor authentication from scratch if this checkbox is checked.
-Heads up: Multi-factor authentication is actively set up by users to better protect their accounts. Please make sure to properly authenticate the user before disabling multi-factor authentication for their account.]]> +Attention: Multi-factor authentication is actively set up by users to better protect their accounts. Please make sure to properly authenticate the user before disabling multi-factor authentication for their account.]]> @@ -3466,7 +3466,7 @@ Attachments: userID}{/link}">{$user->username}”{else}{#$users|count} users{/if} should be deleted.]]> - Heads up: The content will be deleted irrevocably and without any further confirmation prompt!]]> + Attention: The content will be deleted irrevocably and without any further confirmation prompt!]]> -- 2.20.1