Minor improvements for bulk compressions

Author: Jacob Middag

src/class-tiny-plugin.php

@@ -75,8 +75,9 @@ public function enqueue_scripts($hook) {
         wp_localize_script($handle, 'tinyCompress', array(
             'nonce' => wp_create_nonce('tiny-compress'),
             'L10nAllDone' => self::translate('All images are processed'),
-            'L10nBulkAction' => self::translate('Compress all'),
+            'L10nBulkAction' => self::translate('Compress images'),
             'L10nCompressing' => self::translate('Compressing'),
+            'L10nCompressions' => self::translate('compressions'),
             'L10nError' => self::translate('Error'),
             'L10nInternalError' => self::translate('Internal error'),
             'L10nOutOf' => self::translate('out of'),
@@ -143,6 +144,7 @@ public function compress_image() {
 
         list($tiny_metadata, $result) = $this->compress($metadata, $id);
         if ($json) {
+            $result['message'] = $tiny_metadata->get_latest_error();
             $result['status'] = $this->settings->get_status();
             $result['thumbnail'] = $tiny_metadata->get_url('thumbnail');
             echo json_encode($result);
@@ -206,16 +208,24 @@ private function render_compress_details($tiny_metadata) {
     }
 
     public function bulk_compress_page() {
+        global $wpdb;
+
         echo '<div class="wrap" id="tiny-bulk-compress">';
         echo '<h2>' . self::translate('Compress JPEG & PNG Images') . '</h2>';
         if (empty($_POST['tiny-bulk-compress']) && empty($_REQUEST['ids'])) {
-            echo '<p>' . self::translate_escape("Use this tool to compress all images via the Tiny API service") . '.</p>';
-            echo '<p>' . self::translate_escape("To begin, just press the button below") . '.</p>';
+            $result = $wpdb->get_results("SELECT COUNT(*) AS `count` FROM $wpdb->posts WHERE post_type = 'attachment' AND post_mime_type LIKE 'image/%' ORDER BY ID DESC", ARRAY_A);
+            $count = $result[0]['count'];
+
+            echo '<p>' . self::translate_escape("Use this tool to compress all images in your media library") . '. ';
+            echo self::translate_escape("Only images that have not been compressed will be compressed") . '.</p>';
+            echo '<p>' . sprintf(self::translate_escape("We have found %d images in your media library"), $count) . '. ';
+            echo self::translate_escape("To begin, just press the button below") . '.</p>';
 
             echo '<form method="POST" action="?page=tiny-bulk-compress">';
             echo '<input type="hidden" name="_wpnonce" value="' . wp_create_nonce('tiny-bulk-compress') . '">';
             echo '<input type="hidden" name="tiny-bulk-compress" value="1">';
-            echo '<p><button class="button" type="submit">'. self::translate_escape('Compress all images') .'</p>';
+            echo '<p><button class="button button-primary button-large" type="submit">' .
+                self::translate_escape('Compress all images') . '</p>';
             echo '</form>';
         } else {
             check_admin_referer('tiny-bulk-compress');
@@ -227,7 +237,6 @@ public function bulk_compress_page() {
                 $cond = "";
             }
 
-            global $wpdb;
             // Get all ids and names of the images and not the whole objects which will only fill memory
             $items = $wpdb->get_results("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'attachment' AND post_mime_type LIKE 'image/%' $cond ORDER BY ID DESC", ARRAY_A);
 
@@ -239,7 +248,7 @@ public function bulk_compress_page() {
             echo "</p>";
 
             echo '<div id="tiny-status"><p>'. self::translate_escape('Compressions this month') . sprintf(' <span>%d</span></p></div>', $this->settings->get_status());
-            echo '<div id="tiny-progress"><p>'. self::translate_escape('Processing') . ': <span>0</span> ' . self::translate_escape('out of') . sprintf(' %d </p></div>', count($items));
+            echo '<div id="tiny-progress"><p>'. self::translate_escape('Processing') . ' <span>0</span> ' . self::translate_escape('out of') . sprintf(' %d </p></div>', count($items));
             echo '<div id="tiny-images">';
             echo '</div>';
 

src/languages/tiny-compress-images-nl_NL.mo

@@ -37,8 +37,8 @@ msgstr "Compressie"
 msgid "Compress"
 msgstr "Comprimeer"
 
-msgid "Compress all"
-msgstr "Comprimeer alles"
+msgid "Compress images"
+msgstr "Comprimeer afbeeldingen"
 
 msgid "Compressed %d out of %d sizes"
 msgstr "%d van de %d afmetingen zijn gecomprimeerd"
@@ -143,10 +143,10 @@ msgid "Please fill in an API key to start compressing images"
 msgstr "Vul een API-sleutel in om te starten met comprimeren"
 
 msgid "Compress all images"
-msgstr "Comprimeer afbeeldingen"
+msgstr "Comprimeer alle afbeeldingen"
 
 msgid "Compress JPEG & PNG Images"
-msgstr "Comprimeer alle JPEG & PNG afbeeldingen"
+msgstr "Comprimeer JPEG & PNG afbeeldingen"
 
 msgid "All images are processed"
 msgstr "Alle afbeeldingen zijn verwerkt"
@@ -163,11 +163,20 @@ msgstr "Wachten"
 msgid "Compressing"
 msgstr "Comprimeren"
 
+msgid "compressions"
+msgstr "compressies"
+
 msgid "out of"
 msgstr "van de"
 
-msgid "Use this tool to compress all images via the Tiny API service"
-msgstr "Deze tool comprimeert alle afbeeldingen via de Tiny API-dienst"
+msgid "Use this tool to compress all images in your media library"
+msgstr "Deze tool comprimeert alle afbeeldingen in je media-bibliotheek"
+
+msgid "Only images that have not been compressed will be compressed"
+msgstr "Dit geldt alleen voor de afbeeldingen die nog niet zijn gecomprimeerd"
+
+msgid "We have found %d images in your media library"
+msgstr "We hebben %d afbeeldingen in de media-bibliotheek gevonden"
 
 msgid "To begin, just press the button below"
 msgstr "Druk op de knop om te starten"

src/languages/tiny-compress-images-nl_NL.po

@@ -57,20 +57,19 @@
       if (error) {
         row.find('.bar').addClass('failed')
         row.find('.percent').html(tinyCompress.L10nInternalError)
-        row.find('.percent').attr("title", error.toString())
+        row.find('.progress').attr("title", error.toString())
       } else if (data.error) {
         row.find('.bar').addClass('failed')
         row.find('.percent').html(tinyCompress.L10nError)
-        row.find('.percent').attr("title", data.error)
+        row.find('.progress').attr("title", data.error)
       } else if (data.failed > 0) {
         row.find('.bar').addClass('failed')
         row.find('.bar').css('width', '100%')
-        row.find('.percent').html(
-            data.failed + " " + tinyCompress.L10nOutOf + " " + (data.success + data.failed))
+        row.find('.percent').html(data.success + " " + tinyCompress.L10nCompressions)
+        row.find('.progress').attr("title", data.message)
       } else {
         row.find('.bar').css('width', '100%')
-        row.find('.percent').html(
-            data.success + " " + tinyCompress.L10nOutOf + " " + (data.success + data.failed))
+        row.find('.percent').html(data.success + " " + tinyCompress.L10nCompressions)
       }
       if (data.status) {
         jQuery('#tiny-status span').html(data.status)

src/scripts/admin.js

@@ -17,7 +17,7 @@ public function tearDown() {
     public function testBulkCompressActionShouldBePresentInMedia() {
         $this->upload_image(dirname(__FILE__) . '/../fixtures/input-example.png');
         self::$driver->get(wordpress('/wp-admin/upload.php?mode=list'));
-        $this->assertEquals('Compress all', self::$driver->findElement(
+        $this->assertEquals('Compress images', self::$driver->findElement(
             WebDriverBy::cssSelector('select[name="action"] option[value="tiny_bulk_compress"]')
         )->getText());
     }