diff options
author | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-04-02 08:52:24 +0200 |
commit | 7127626f55f0ae5843d38145bf80022b98e4a8d8 (patch) | |
tree | 59813e196f7288be421cf187c2231adedca7d4b6 /mod/dfrn_request.php | |
parent | f39e8126773e2a030cf84c8b9d428cc78546c1b9 (diff) | |
parent | 1f74bd1b78f7db4940f0fded0d6f7716579218f0 (diff) | |
download | volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.gz volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.tar.bz2 volse-hubzilla-7127626f55f0ae5843d38145bf80022b98e4a8d8.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/dfrn_request.php')
-rwxr-xr-x | mod/dfrn_request.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index c2d37dac7..5881b7b51 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -664,8 +664,8 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), - $target_addr) . EOL . EOL; + # $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), + # $target_addr) . EOL . EOL; $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:"); @@ -699,7 +699,7 @@ function dfrn_request_content(&$a) { '$friendica' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), - '$diasnote' => t('- please share from your own site as noted above'), + '$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, '$emailnet' => $emailnet, |