From 89da23c30e132fa1f0c118e32e386cbd9c3c88af Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 9 Feb 2011 09:40:56 +0100 Subject: [PATCH] spaces for the string extractor, check no parent --- addon/statusnet/statusnet.php | 24 ++++++++++++------------ addon/twitter/twitter.php | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index b1d330541..cd562cd1e 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -127,13 +127,13 @@ function statusnet_settings(&$a,&$s) { /*** * no consumer keys */ - $s .= '

'.t('No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.').'

'; + $s .= '

'. t('No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.') .'

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; $s .= '
'; @@ -154,10 +154,10 @@ function statusnet_settings(&$a,&$s) { /*** * make some nice form */ - $s .= '

'.t('To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.').'

'; - $s .= ''.t('Log in with StatusNet').''; + $s .= '

'. t('To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.') .'

'; + $s .= ''. t('Log in with StatusNet') .''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= ''; $s .= ''; @@ -170,14 +170,14 @@ function statusnet_settings(&$a,&$s) { */ $connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret); $details = $connection->get('account/verify_credentials'); - $s .= '

'.t('Currently connected to: ').''.$details->screen_name.'
'.$details->description.'

'; - $s .= '

'.t('If enabled all your public postings will be posted to the associated StatusNet account as well.').'

'; + $s .= '

'. t('Currently connected to: ') .''.$details->screen_name.'
'.$details->description.'

'; + $s .= '

'. t('If enabled all your public postings will be posted to the associated StatusNet account as well.') .'

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; $s .= '
'; @@ -195,7 +195,7 @@ function statusnet_post_hook(&$a,&$b) { logger('StatusNet post invoked'); - if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) { + if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (!$b['parent']) ) { load_pconfig(local_user(), 'statusnet'); diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index 961cca3bf..1cd6ee7e9 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -101,14 +101,14 @@ function twitter_settings(&$a,&$s) { $osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' ); $enabled = get_pconfig(local_user(), 'twitter', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); - $s .= '

'.t('Twitter Posting Settings').'

'; + $s .= '

'. t('Twitter Posting Settings') .'

'; if ( (!$ckey) && (!$csecret) ) { /*** * no global consumer keys * display warning and skip personal config */ - $s .= '

'.t('No consumer key pair for Twitter found. Please contact your site administrator.').'

'; + $s .= '

'. t('No consumer key pair for Twitter found. Please contact your site administrator.') .'

'; } else { /*** * ok we have a consumer key pair now look into the OAuth stuff @@ -127,10 +127,10 @@ function twitter_settings(&$a,&$s) { /*** * make some nice form */ - $s .= '

'.t('At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.').'

'; + $s .= '

'. t('At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.') .'

'; $s .= ''.t('Log in with Twitter').''; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= ''; $s .= ''; @@ -144,14 +144,14 @@ function twitter_settings(&$a,&$s) { require_once('addon/twitter/twitteroauth.php'); $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret); $details = $connection->get('account/verify_credentials'); - $s .= '

'.t('Currently connected to: ').''.$details->screen_name.'
'.$details->description.'

'; - $s .= '

'.t('If enabled all your public postings will be posted to the associated Twitter account as well.').'

'; + $s .= '

'. t('Currently connected to: ') .''.$details->screen_name.'
'.$details->description.'

'; + $s .= '

'. t('If enabled all your public postings will be posted to the associated Twitter account as well.') .'

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ''; $s .= '
'; $s .= '
'; @@ -169,7 +169,7 @@ function twitter_post_hook(&$a,&$b) { logger('twitter post invoked'); - if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) { + if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (! $b['parent']) ) { load_pconfig(local_user(), 'twitter');