diff --git a/facebook/facebook.php b/facebook/facebook.php index 00f7c4b2a..0102675fa 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -6,19 +6,17 @@ */ /** - * Installing the Friendika/Facebook connector + * Installing the Friendica/Facebook connector * * 1. register an API key for your site from developer.facebook.com - * a. We'd be very happy if you include "Friendika" in the application name - * to increase name recognition. The Friendika icons are also present + * a. We'd be very happy if you include "Friendica" in the application name + * to increase name recognition. The Friendica icons are also present * in the images directory and may be uploaded as a Facebook app icon. - * Use images/friendika-16.jpg for the Icon and images/friendika-128.jpg for the Logo. + * Use images/friendica-16.jpg for the Icon and images/friendica-128.jpg for the Logo. * b. The url should be your site URL with a trailing slash. - * You may use http://portal.friendika.com/privacy as the privacy policy - * URL unless your site has different requirements, and - * http://portal.friendika.com as the Terms of Service URL unless - * you have different requirements. (Friendika is a software application - * and does not require Terms of Service, though your installation of it might). + * Friendica is a software application and does not require a Privacy Policy + * or Terms of Service, though your installation of it might. Facebook may require + * that you provide a Privacy Policy, which we find ironic. * c. Set the following values in your .htconfig.php file * $a->config['facebook']['appid'] = 'xxxxxxxxxxx'; * $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx'; @@ -632,7 +630,7 @@ function facebook_post_hook(&$a,&$b) { $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg); if((strpos($link,z_root()) !== false) && (! $image)) - $image = $a->get_baseurl() . '/images/friendika-64.jpg'; + $image = $a->get_baseurl() . '/images/friendica-64.jpg'; $msg = trim(strip_tags(bbcode($msg))); $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); @@ -705,7 +703,7 @@ function facebook_post_hook(&$a,&$b) { else { $url = 'https://graph.facebook.com/me/feed'; if($b['plink']) - $postvars['actions'] = '{"name": "' . t('View on Friendika') . '", "link": "' . $b['plink'] . '"}'; + $postvars['actions'] = '{"name": "' . t('View on Friendica') . '", "link": "' . $b['plink'] . '"}'; } logger('facebook: post to ' . $url); diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index c29ea2edc..6580e8972 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -5,7 +5,7 @@ * Author: Tobias Diekershoff */ -/* StatusNet Plugin for Friendika +/* StatusNet Plugin for Friendica * * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net @@ -56,7 +56,7 @@ class StatusNetOAuth extends TwitterOAuth { * * @return API results * - * Copied here from the twitteroauth library and complemented by applying the proxy settings of friendika + * Copied here from the twitteroauth library and complemented by applying the proxy settings of friendica */ function http($url, $method, $postfields = NULL) { $this->http_info = array(); @@ -282,7 +282,7 @@ function statusnet_settings(&$a,&$s) { $s .= '
'; } $s .= '

' . t('Provide your own OAuth Credentials') . '

'; - $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 Friendica 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 Friendica installation at your favorited StatusNet installation.') .'

'; $s .= '
'; $s .= ''; $s .= '
'; diff --git a/twitter/twitter.php b/twitter/twitter.php index 6f13a443b..c492c6c73 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -6,7 +6,7 @@ */ -/* Twitter Plugin for Friendika +/* Twitter Plugin for Friendica * * Author: Tobias Diekershoff * tobias.diekershoff@gmx.net @@ -17,7 +17,7 @@ * To use this plugin you need a OAuth Consumer key pair (key & secret) * you can get it from Twitter at https://twitter.com/apps * - * Register your Friendika site as "Client" application with "Read & Write" access + * Register your Friendica site as "Client" application with "Read & Write" access * we do not need "Twitter as login". When you've registered the app you get the * OAuth Consumer key and secret pair for your application/site. * @@ -168,7 +168,7 @@ 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 Friendica 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 .= ''; diff --git a/widgets/widget_friends.php b/widgets/widget_friends.php index 6b1cf18c4..195667e89 100644 --- a/widgets/widget_friends.php +++ b/widgets/widget_friends.php @@ -37,6 +37,6 @@ function friends_widget_content(&$a, $conf){ "; $o .= _abs_url(contact_block()); - $o .= "profile['nickname']."'>". t('Connect on Friendika!') .""; + $o .= "profile['nickname']."'>". t('Connect on Friendica!') .""; return $o; }