Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / Minify / minify.php

diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php
index bac1df8e2d1414c186b53dfad1e141d083512330..b7bee7c8815e572b6a4fa301a7b608fe951383df 100644 (file)
--- a/plugins/Minify/minify.php
+++ b/plugins/Minify/minify.php
@@ -46,16 +46,18 @@ class MinifyAction extends Action
             if(file_exists($this->file)) {
                 return true;
             } else {
-                $this->clientError(_('f parameter is not a valid path'),404);
+                // TRANS: Client error displayed when not providing a valid path in parameter "f".
+                $this->clientError(_m('The parameter "f" is not a valid path.'),404);
                 return false;
             }
         }else{
-            $this->clientError(_('f parameter is required'),500);
+            // TRANS: Client error displayed when not providing parameter "f".
+            $this->clientError(_m('The parameter "f" is required but missing.'),500);
             return false;
         }
     }
 
-    function etag() 
+    function etag()
     {
         if(isset($this->v)) {
             return "\"" . crc32($this->file . $this->v) . "\"";
@@ -73,7 +75,7 @@ class MinifyAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        
+
         $c = Cache::instance();
         if (!empty($c)) {
             $cacheKey = Cache::key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
@@ -108,10 +110,10 @@ class MinifyAction extends Action
                 header('Content-Type: ' . self::TYPE_CSS);
                 break;
             default:
-                $this->clientError(_('File type not supported'),500);
+                // TRANS: Client error displayed when trying to minify an unsupported file type.
+                $this->clientError(_m('File type not supported.'),500);
                 return false;
         }
         return $out;
     }
 }
-