From 7e177b7ec6ac070e5f31749e26feabc89796d46a Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 23 Sep 2010 12:48:15 -0700 Subject: [PATCH 1/3] Add Netbeans project metadata dir to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 217622c84d..d84e5e7424 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ good-config.php lac08.log php.log .DS_Store +nbproject From 62f7d6c74dcfca5f073c04aa3ba68b9d6a4ac77d Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 23 Sep 2010 15:46:01 -0700 Subject: [PATCH 2/3] Fix strings in Disqus plugin for i18n --- plugins/Disqus/DisqusPlugin.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/Disqus/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php index 3901562f98..96bfb4e09f 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'); From c75bd62a4c4f25287beb4e1ca43bb4f94b4ffcd9 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Thu, 23 Sep 2010 16:16:32 -0700 Subject: [PATCH 3/3] Update OAuth actions in show application page so it will display the right endpoint URLs --- actions/showapplication.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/showapplication.php b/actions/showapplication.php index fa44844816..10aaff538f 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -271,17 +271,17 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementStart('dl', 'entity_request_token_url'); $this->element('dt', null, _('Request token URL')); - $this->element('dd', null, common_local_url('apioauthrequesttoken')); + $this->element('dd', null, common_local_url('ApiOauthRequestToken')); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_access_token_url'); $this->element('dt', null, _('Access token URL')); - $this->element('dd', null, common_local_url('apioauthaccesstoken')); + $this->element('dd', null, common_local_url('ApiOauthAccessToken')); $this->elementEnd('dl'); $this->elementStart('dl', 'entity_authorize_url'); $this->element('dt', null, _('Authorize URL')); - $this->element('dd', null, common_local_url('apioauthauthorize')); + $this->element('dd', null, common_local_url('ApiOauthAuthorize')); $this->elementEnd('dl'); $this->element('p', 'note',