harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source
This commit is contained in:
redmatrix
2015-05-17 19:49:36 -07:00
parent f0cb3cba12 76558df966
commit 7c7a5cba8f
31 changed files with 612 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/diaspora.php
View File

@@ -706,8 +706,9 @@ function diaspora_request($importer,$xml) {
$cnv = random_string();
$mid = random_string();
$msg = t('You have started sharing with a Hubzilla premium channel.');
$msg .= t('Hubzilla premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r";
$msg = t('You have started sharing with a $Projectname premium channel.');
$msg .= t('$Projectname premium channels are not available for sharing with Diaspora members. This sharing request has been blocked.') . "\r";
$msg .= t('Please do not reply to this message, as this channel is not sharing with you and any reply will not be seen by the recipient.') . "\r";
$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
@@ -2449,7 +2450,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
'$handle' => xmlify($myaddr),
'$public' => $public,
'$created' => $created,
'$provider' => (($item['app']) ? $item['app'] : 'hubzilla')
'$provider' => (($item['app']) ? $item['app'] : t('$projectname'))
));
} else {
$tpl = get_markup_template('diaspora_post.tpl');
@@ -2460,7 +2461,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
'$handle' => xmlify($myaddr),
'$public' => $public,
'$created' => $created,
'$provider' => (($item['app']) ? $item['app'] : 'hubzilla')
'$provider' => (($item['app']) ? $item['app'] : t('$projectname'))
));
}