Added description to networks, renaming some network names
This commit is contained in:
Michael
parent
6f7510550d
commit
df89e0384d
16
boot.php
16
boot.php
|
|
@ -254,24 +254,24 @@ define('PROTOCOL_SPLITTED_CONV', 6);
|
|||
* @{
|
||||
*/
|
||||
define('NETWORK_DFRN', 'dfrn'); // Friendica, Mistpark, other DFRN implementations
|
||||
define('NETWORK_ZOT', 'zot!'); // Zot!
|
||||
define('NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations
|
||||
define('NETWORK_ZOT', 'zot!'); // Zot! - Currently unsupported
|
||||
define('NETWORK_OSTATUS', 'stat'); // GNU-social, Pleroma, Mastodon, other OStatus implementations
|
||||
define('NETWORK_FEED', 'feed'); // RSS/Atom feeds with no known "post/notify" protocol
|
||||
define('NETWORK_DIASPORA', 'dspr'); // Diaspora
|
||||
define('NETWORK_MAIL', 'mail'); // IMAP/POP
|
||||
define('NETWORK_FACEBOOK', 'face'); // Facebook API
|
||||
define('NETWORK_LINKEDIN', 'lnkd'); // LinkedIn
|
||||
define('NETWORK_XMPP', 'xmpp'); // XMPP
|
||||
define('NETWORK_MYSPACE', 'mysp'); // MySpace
|
||||
define('NETWORK_XMPP', 'xmpp'); // XMPP - Currently unsupported
|
||||
define('NETWORK_MYSPACE', 'mysp'); // MySpace - Currently unsupported
|
||||
define('NETWORK_GPLUS', 'goog'); // Google+
|
||||
define('NETWORK_PUMPIO', 'pump'); // pump.io
|
||||
define('NETWORK_TWITTER', 'twit'); // Twitter
|
||||
define('NETWORK_DIASPORA2', 'dspc'); // Diaspora connector
|
||||
define('NETWORK_STATUSNET', 'stac'); // Statusnet connector
|
||||
define('NETWORK_APPNET', 'apdn'); // app.net
|
||||
define('NETWORK_NEWS', 'nntp'); // Network News Transfer Protocol
|
||||
define('NETWORK_ICALENDAR', 'ical'); // iCalendar
|
||||
define('NETWORK_PNUT', 'pnut'); // pnut.io
|
||||
define('NETWORK_APPNET', 'apdn'); // app.net - Dead protocol
|
||||
define('NETWORK_NEWS', 'nntp'); // Network News Transfer Protocol - Currently unsupported
|
||||
define('NETWORK_ICALENDAR', 'ical'); // iCalendar - Currently unsupported
|
||||
define('NETWORK_PNUT', 'pnut'); // pnut.io - Currently unsupported
|
||||
define('NETWORK_PHANTOM', 'unkn'); // Place holder
|
||||
/**
|
||||
* @}
|
||||
|
|
|
|||
|
|
@ -1279,7 +1279,7 @@ function admin_page_site(App $a)
|
|||
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
|
||||
'$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), Config::get('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")),
|
||||
'$touch_icon' => array('touch_icon', t("Touch icon"), Config::get('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")),
|
||||
'$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())),
|
||||
'$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/servers.'), get_server())),
|
||||
'$language' => array('language', t("System language"), Config::get('system','language'), "", $lang_choices),
|
||||
'$theme' => array('theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
|
||||
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
|
||||
|
|
|
|||
|
|
@ -727,7 +727,7 @@ function dfrn_request_content(App $a) {
|
|||
|
||||
$o = replace_macros($tpl,array(
|
||||
'$header' => t('Friend/Connection Request'),
|
||||
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
|
||||
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
|
||||
'$pls_answer' => t('Please answer the following:'),
|
||||
'$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))),
|
||||
/*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
|
||||
|
|
@ -736,8 +736,8 @@ function dfrn_request_content(App $a) {
|
|||
'$add_note' => t('Add a personal note:'),
|
||||
'$page_desc' => $page_desc,
|
||||
'$friendica' => t('Friendica'),
|
||||
'$statusnet' => t('StatusNet/Federated Social Web'),
|
||||
'$diaspora' => t('Diaspora'),
|
||||
'$statusnet' => t('GNU Social (Pleroma, Mastodon)'),
|
||||
'$diaspora' => t('Diaspora (Socialhome, Hubzilla)'),
|
||||
'$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr),
|
||||
'$your_address' => t('Your Identity Address:'),
|
||||
'$invite_desc' => $invite_desc,
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ function check_php(&$phpath, &$checks) {
|
|||
$help = "";
|
||||
if (!$passed) {
|
||||
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
||||
$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
|
||||
$help .= t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
|
||||
$help .= EOL . EOL;
|
||||
$tpl = get_markup_template('field_input.tpl');
|
||||
$help .= replace_macros($tpl, array(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
/* identi.ca -> friendica items permanent-url compatibility */
|
||||
/* GNU Social -> friendica items permanent-url compatibility */
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\System;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<p id="dfrn-request-intro">
|
||||
{{$page_desc}}<br />
|
||||
<ul id="dfrn-request-networks">
|
||||
<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
|
||||
<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
|
||||
<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
|
||||
<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
|
||||
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
|
||||
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
|
||||
</ul>
|
||||
</p>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
<p id="dfrn-request-intro">
|
||||
{{$page_desc}}<br />
|
||||
<ul id="dfrn-request-networks">
|
||||
<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
|
||||
<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
|
||||
<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
|
||||
<li><a href="http://friendi.ca" title="{{$friendica}}">{{$friendica}}</a></li>
|
||||
<li><a href="https://diasporafoundation.org" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
|
||||
<li><a href="https://gnu.io/social/" title="{{$statusnet}}" >{{$statusnet}}</a></li>
|
||||
</ul>
|
||||
{{$invite_desc}}
|
||||
</p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user