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

This commit is contained in:
Evan Prodromou 2011-04-07 10:26:50 -04:00
commit 703f19a108

View File

@ -140,6 +140,7 @@ ENDOFSCRIPT;
$action->elementStart('noscript'); $action->elementStart('noscript');
// TRANS: User notification that JavaScript is required for Disqus comment display. // TRANS: User notification that JavaScript is required for Disqus comment display.
// TRANS: This message contains Markdown links in the form [description](link).
$noScriptMsg = sprintf(_m("Please enable JavaScript to view the [comments powered by Disqus](http://disqus.com/?ref_noscript=%s)."), $this->shortname); $noScriptMsg = sprintf(_m("Please enable JavaScript to view the [comments powered by Disqus](http://disqus.com/?ref_noscript=%s)."), $this->shortname);
$output = common_markup_to_html($noScriptMsg); $output = common_markup_to_html($noScriptMsg);
$action->raw($output); $action->raw($output);