From c993e0df92c2b3888ed543fce86f033d654aa260 Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Fri, 6 Jun 2014 14:48:46 -0500
Subject: [PATCH] Issue #1079116 by fearlsgroove, joachim, ryanissamson,
manarth, katherined, droppinshucks, BiigNiick | fietserwin: Fixed Inaccurate
text: Images must be smaller than !max pixels.
---
core/modules/file/file.field.inc | 4 ++--
core/modules/image/src/Tests/ImageFieldDisplayTest.php | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
index f9aa9f9620f7..67db185dbfa6 100644
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -198,13 +198,13 @@ function theme_file_upload_help($variables) {
$descriptions[] = t('Images must be exactly !size pixels.', array('!size' => '<strong>' . $max . '</strong>'));
}
elseif ($min && $max) {
- $descriptions[] = t('Images must be between !min and !max pixels.', array('!min' => '<strong>' . $min . '</strong>', '!max' => '<strong>' . $max . '</strong>'));
+ $descriptions[] = t('Images must be larger than !min pixels. Images larger than !max pixels will be resized.', array('!min' => '<strong>' . $min . '</strong>', '!max' => '<strong>' . $max . '</strong>'));
}
elseif ($min) {
$descriptions[] = t('Images must be larger than !min pixels.', array('!min' => '<strong>' . $min . '</strong>'));
}
elseif ($max) {
- $descriptions[] = t('Images must be smaller than !max pixels.', array('!max' => '<strong>' . $max . '</strong>'));
+ $descriptions[] = t('Images larger than !max pixels will be resized.', array('!max' => '<strong>' . $max . '</strong>'));
}
}
diff --git a/core/modules/image/src/Tests/ImageFieldDisplayTest.php b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
index bda5ac8c3052..5adddefa2b78 100644
--- a/core/modules/image/src/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/src/Tests/ImageFieldDisplayTest.php
@@ -183,7 +183,7 @@ function testImageFieldSettings() {
$this->drupalGet('node/add/article');
$this->assertText(t('50 KB limit.'), 'Image widget max file size is displayed on article form.');
$this->assertText(t('Allowed types: ' . $test_image_extension . '.'), 'Image widget allowed file types displayed on article form.');
- $this->assertText(t('Images must be between 10x10 and 100x100 pixels.'), 'Image widget allowed resolution displayed on article form.');
+ $this->assertText(t('Images must be larger than 10x10 pixels. Images larger than 100x100 pixels will be resized.'), 'Image widget allowed resolution displayed on article form.');
// We have to create the article first and then edit it because the alt
// and title fields do not display until the image has been attached.
--
GitLab