diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-05 03:56:10 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-05 03:56:10 -0700 |
| commit | a3c37f145817407df28e9ffea6a83a6cd2b31cdd (patch) | |
| tree | 86a1b3a9497fd6a67d57ac2ae081d1530b4ea30f /include/diaspora.php | |
| parent | 57fcfc9398356bc2223341676500a77b607e9bd9 (diff) | |
| download | volse-hubzilla-a3c37f145817407df28e9ffea6a83a6cd2b31cdd.tar.gz volse-hubzilla-a3c37f145817407df28e9ffea6a83a6cd2b31cdd.tar.bz2 volse-hubzilla-a3c37f145817407df28e9ffea6a83a6cd2b31cdd.zip | |
first pass name change
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 75eac7681..530a83564 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -329,7 +329,7 @@ function find_diaspora_person_by_handle($handle) { if(! $person) { // try webfinger. Make sure to distinguish between diaspora, - // redmatrix w/diaspora protocol and friendica w/diaspora protocol. + // hubzilla w/diaspora protocol and friendica w/diaspora protocol. $result = discover_by_webbie($handle); if($result) { @@ -706,8 +706,8 @@ function diaspora_request($importer,$xml) { $cnv = random_string(); $mid = random_string(); - $msg = t('You have started sharing with a Redmatrix premium channel.'); - $msg .= t('Redmatrix 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 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('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'); @@ -2444,7 +2444,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') )); } else { $tpl = get_markup_template('diaspora_post.tpl'); @@ -2454,7 +2454,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, - '$provider' => (($item['app']) ? $item['app'] : 'redmatrix') + '$provider' => (($item['app']) ? $item['app'] : 'hubzilla') )); } |