summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-09-24 18:20:45 -0700
committerZach Copley <zach@status.net>2010-09-24 18:20:45 -0700
commit7721e64a42d6bcde640be2712a1c8eb8f0fbeb29 (patch)
tree835c742252c4f5e8cbec20167a36bf6b3903215b
parentda048589021b59e9165529567b9b018290432c72 (diff)
parentc75bd62a4c4f25287beb4e1ca43bb4f94b4ffcd9 (diff)
Merge branch '0.9.x'
-rw-r--r--.gitignore1
-rw-r--r--plugins/Disqus/DisqusPlugin.php10
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 217622c84..d84e5e742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ good-config.php
lac08.log
php.log
.DS_Store
+nbproject
diff --git a/plugins/Disqus/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php
index 3901562f9..96bfb4e09 100644
--- a/plugins/Disqus/DisqusPlugin.php
+++ b/plugins/Disqus/DisqusPlugin.php
@@ -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');