Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / plugins / LinkPreview / LinkPreviewPlugin.php

diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php
index 65f896ca2745867200d2f31adbf594d08b9d4d57..09b3a2af645d05900ba4cded2ac8255827c1cd1a 100644 (file)
--- a/plugins/LinkPreview/LinkPreviewPlugin.php
+++ b/plugins/LinkPreview/LinkPreviewPlugin.php
@@ -36,7 +36,8 @@ class LinkPreviewPlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:LinkPreview',
                             'rawdescription' =>
-                            _m('UI extensions previewing thumbnails from links.'));
+                            // TRANS: Plugin description.
+                            _m('UI extension for previewing thumbnails from links.'));
 
         return true;
     }
@@ -51,7 +52,12 @@ class LinkPreviewPlugin extends Plugin
     {
         $user = common_current_user();
         if ($user && common_config('attachments', 'process_links')) {
-            $action->script('plugins/LinkPreview/linkpreview.min.js');
+            if (common_config('site', 'minify')) {
+                $js = 'linkpreview.min.js';
+            } else {
+                $js = 'linkpreview.js';
+            }
+            $action->script($this->path($js));
             $data = json_encode(array(
                 'api' => common_local_url('oembedproxy'),
                 'width' => common_config('attachments', 'thumbwidth'),