Small changes to the limit reach admin notice and translations of it.

Author: Edwin Westerhoud

src/class-tiny-settings.php

@@ -191,8 +191,8 @@ public function after_compress_callback($details, $headers) {
             update_option($field, $headers["Compression-Count"]);
 
             if (isset($details['error']) && $details['error'] == 'TooManyRequests') {
-                $link = '<a href="https://tinypng.com/developers" target="_blank">' . self::translate_escape('TinyPNG API subscription') . '</a>';
-                $this->add_admin_notice('limit_reached', sprintf(self::translate_escape('You have reached your limit of %s compressions this month. Upgrade your %s if you like to compress more images') . '.', $headers["Compression-Count"], $link));
+                $link = '<a href="https://tinypng.com/developers" target="_blank">' . self::translate_escape('subscription') . '</a>';
+                $this->add_admin_notice('limit_reached', sprintf(self::translate_escape('you have reached your limit of %s compressions this month. Upgrade your %s if you like to compress more images') . '.', $headers["Compression-Count"], $link));
             } else {
                 $this->remove_admin_notice('limit_reached');
             }

src/class-tiny-wp-base.php

@@ -118,6 +118,6 @@ public function remove_admin_notice($name) {
     }
 
     private function show_admin_notice($name, $message) {
-        add_action('admin_notices', create_function('', "echo '<div class=\"error\"><p>Tiny Compress Images: $message | <a href=\"?$name=0\">Dismiss</a></p></div>';"));
+        add_action('admin_notices', create_function('', "echo '<div class=\"updated\"><p>Compress JPEG & PNG images: $message &nbsp;<a href=\"?$name=0\">" . self::translate_escape('Dismiss') . "</a></p></div>';"));
     }
 }

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

@@ -106,6 +106,9 @@ msgstr "De API-sleutel is geconfigureerd in %s"
 msgid "Connection status"
 msgstr "Verbinding status"
 
+msgid "Dismiss"
+msgstr "Negeer"
+
 msgid "TinyPNG API subscription"
 msgstr "TinyPNG API subscription"
 
@@ -127,5 +130,5 @@ msgstr "Je hebt je maandelijkse limiet van %s compressies bereikt"
 msgid "If you need to compress more images you can change your %s"
 msgstr "Als je meer plaatjes wilt comprimeren kun je je %s aanpassen"
 
-msgid "You have reached your limit of %s compressions this month. Upgrade your %s if you like to compress more images"
-msgstr "Je hebt je maandelijkse limiet van %s compressies bereikt. Upgrade je %s als je meer plaatjes wilt comprimeren"
+msgid "you have reached your limit of %s compressions this month. Upgrade your %s if you like to compress more images"
+msgstr "je hebt je maandelijkse limiet van %s compressies bereikt. Upgrade je %s als je meer plaatjes wilt comprimeren"

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

@@ -35,18 +35,27 @@ public function testShrink() {
     public function testLimitReached() {
         $this->set_api_key('LIMIT123');
         $this->upload_image(dirname(__FILE__) . '/../fixtures/example-tinypng.png');
-        $elements = self::$driver->findElement(WebDriverBy::className('error'))->findElements(WebDriverBy::tagName('p'));
+        $elements = self::$driver->findElement(WebDriverBy::className('updated'))->findElements(WebDriverBy::tagName('p'));
         $error_messages = array_map('innerText', $elements);
-        $this->assertContains('Tiny Compress Images: You have reached your limit of 500 compressions this month. Upgrade your TinyPNG API subscription if you like to compress more images. | Dismiss', $error_messages);
+        foreach ($error_messages as $error) {
+            if (strpos($error, 'you have reached your limit of 500 compressions this month')) {
+                return;
+            }
+        }
+        $this->fail('Admin notice has not been found');
     }
 
     public function testLimitReachedDismisses() {
         $this->set_api_key('LIMIT123');
         $this->upload_image(dirname(__FILE__) . '/../fixtures/example-tinypng.png');
         $dismiss_links = self::$driver->findElements(WebDriverBy::xpath('//a[contains(@href, "tinypng_limit_reached=0")]'));
         $dismiss_links[0]->click();
-        $elements = self::$driver->findElement(WebDriverBy::className('error'))->findElements(WebDriverBy::tagName('p'));
+        $elements = self::$driver->findElements(WebDriverBy::xpath('//a[contains(@href, "tinypng_limit_reached=0")]'));
         $error_messages = array_map('innerText', $elements);
-        $this->assertNotContains('Tiny Compress Images: You have reached your limit of 500 compressions this month. Upgrade your TinyPNG API subscription if you like to compress more images. | Dismiss', $error_messages);
+        foreach ($error_messages as $error) {
+            if (strpos($error, 'Dismiss')) {
+                $this->fail('Admin notice should not be shown');
+            }
+        }
     }
 }