Commit c993e0df authored by Angie Byron's avatar Angie Byron
Browse files

Issue #1079116 by fearlsgroove, joachim, ryanissamson, manarth, katherined,... 

Issue #1079116 by fearlsgroove, joachim, ryanissamson, manarth, katherined, droppinshucks, BiigNiick  | fietserwin: Fixed Inaccurate text: Images must be smaller than !max pixels.
parent 5004fa8f

core/modules/file/file.field.inc

+2 −2
Original line number Diff line number Diff line
@@ -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>'));

    }

  }

core/modules/image/src/Tests/ImageFieldDisplayTest.php

+1 −1
Original line number Diff line number Diff line
@@ -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.