GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x'

This commit is contained in:
Zach Copley 2010-09-24 18:20:45 -07:00
parent da04858902 c75bd62a4c
commit 7721e64a42
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ good-config.php
lac08.log
php.log
.DS_Store
nbproject

10
plugins/Disqus/DisqusPlugin.php
View File

@ -108,14 +108,14 @@ ENDOFSCRIPT;
$action->elementStart('div', $attrs);
$action->elementStart('noscript');
// @todo FIXME: No i18n yet, because of bad implementation. Should be one string.
$action->raw('Please enable JavaScript to view the ');
$noscriptUrl = 'http://disqus.com/?ref_noscript=' . $this->shortname;
$action->element('a', array('href' => $noscriptUrl), 'comments powered by Disqus.');
$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);
$action->raw($output);
$action->elementEnd('noscript');
$action->elementStart('a', array('href' => 'http://disqus.com', 'class' => 'dsq-brlink'));
$action->raw('blog comments powered by ');
$action->raw(_m('Comments powered by '));
$action->element('span', array('class' => 'logo-disqus'), 'Disqus');
$action->elementEnd('a');
$action->elementEnd('div');