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

"webbie" isn't going to cut it. We'll go with "channel address" for now.

Browse Source
This commit is contained in:
friendica 2012-12-06 01:18:30 -08:00
parent c6b8ab534f
commit 4603fde904
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/intro.php
View File

@ -31,6 +31,12 @@ function intro_post(&$a) {
} }
function intro_aside(&$a) {
require_once('include/contact_widgets.php');
$a->set_widget('follow', follow_widget());
}
function intro_content(&$a) { function intro_content(&$a) {
@ -54,12 +60,12 @@ function intro_content(&$a) {
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
if(! intval($r[0]['total'])) { if(! intval($r[0]['total'])) {
notice( t('No pending introductions.') . EOL); notice( t('No pending introductions.') . EOL);
return; return $o;
} }
} }
else { else {
notice( t('System error. Please try again later.') . EOL); notice( t('System error. Please try again later.') . EOL);
return; return $o;
} }
$r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) LIMIT %d, %d", $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) LIMIT %d, %d",

2
mod/new_channel.php
View File

@ -110,7 +110,7 @@ function new_channel_content(&$a) {
'$label_name' => t('Channel Name'), '$label_name' => t('Channel Name'),
'$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '), '$help_name' => t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group" '),
'$label_nick' => t('Choose a short nickname'), '$label_nick' => t('Choose a short nickname'),
'$nick_desc' => t('Your nickname will be used to create an easily remembered web address ("webbie") for your channel.'), '$nick_desc' => t('Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others.'),
'$label_import' => t('Check this box to import an existing channel file from another location'), '$label_import' => t('Check this box to import an existing channel file from another location'),
'$name' => $name, '$name' => $name,
'$nickname' => $nickname, '$nickname' => $nickname,

2
mod/settings.php
View File

@ -956,7 +956,7 @@ function settings_content(&$a) {
$tpl_addr = get_markup_template("settings_nick_set.tpl"); $tpl_addr = get_markup_template("settings_nick_set.tpl");
$prof_addr = replace_macros($tpl_addr,array( $prof_addr = replace_macros($tpl_addr,array(
'$desc' => t('Your channel address (or "webbie") is'), '$desc' => t('Your channel address is'),
'$nickname' => $nickname, '$nickname' => $nickname,
'$subdir' => $subdir, '$subdir' => $subdir,
'$basepath' => $a->get_hostname() '$basepath' => $a->get_hostname()