Ticket #2205: pass geo locations over Twitter bridge (will only be used if enabled...

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 491d7d4810e17ee0db73a36ef0bc8702cfb15161..0fc3a0dc435cd537bd647e2468ee3fcda13335a5 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -198,8 +198,7 @@ class Action extends HTMLOutputter // lawsuit
 
             if (Event::handle('StartShowStatusNetStyles', array($this)) &&
                 Event::handle('StartShowLaconicaStyles', array($this))) {
-                $this->cssLink('css/display.css',null,'screen, projection, tv');
-                $this->cssLink('css/print.css','base','print');
+                $this->cssLink('css/display.css',null, 'screen, projection, tv, print');
                 Event::handle('EndShowStatusNetStyles', array($this));
                 Event::handle('EndShowLaconicaStyles', array($this));
             }
@@ -846,14 +845,16 @@ class Action extends HTMLOutputter // lawsuit
                                             'width' => '80',
                                             'height' => '15'));
                 $this->text(' ');
-                //TODO: This is dirty: i18n
-                $this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
-                $this->element('a', array('class' => 'license',
-                                          'rel' => 'external license',
-                                          'href' => common_config('license', 'url')),
-                               common_config('license', 'title'));
-                $this->text(' ');
-                $this->text(_('license.'));
+                // TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+                $notice = _('All %1$s content and data are available under the %2$s license.');
+                $link = "<a class=\"license\" rel=\"external license\" href=\"" .
+                        htmlspecialchars(common_config('license', 'url')) .
+                        "\">" .
+                        htmlspecialchars(common_config('license', 'title')) .
+                        "</a>";
+                $this->raw(sprintf(htmlspecialchars($notice),
+                                   htmlspecialchars(common_config('site', 'name')),
+                                   $link));
                 $this->elementEnd('p');
                 break;
             }