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

a lot more changes of terminology

Browse Source
This commit is contained in:
friendica 2012-11-03 02:34:12 -07:00
parent 140f464e02
commit 2fa93655c4
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/contact_widgets.php
View File

@ -26,12 +26,12 @@ function findpeople_widget() {
}
return replace_macros(get_markup_template('peoplefind.tpl'),array(
'$findpeople' => t('Find People'),
'$findpeople' => t('Find Channels'),
'$desc' => t('Enter name or interest'),
'$label' => t('Connect/Follow'),
'$hint' => t('Examples: Robert Morgenstein, Fishing'),
'$findthem' => t('Find'),
'$suggest' => t('Friend Suggestions'),
'$suggest' => t('Channel Suggestions'),
'$similar' => t('Similar Interests'),
'$random' => t('Random Profile'),
'$inv' => t('Invite Friends')

12
include/group.php
View File

@ -201,7 +201,7 @@ function mini_group_select($uid,$gid = 0) {
}
}
logger('groups: ' . print_r($grps,true));
logger('mini_group_select: ' . print_r($grps,true), LOGGER_DATA);
$o = replace_macros(get_markup_template('group_selection.tpl'), array(
'$label' => t('Default privacy group for new contacts'),
@ -223,7 +223,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$groups = array();
$groups[] = array(
'text' => t('Everybody'),
'text' => t('All Connections'),
'id' => 0,
'selected' => (($group_id == 0) ? 'group-selected' : ''),
'href' => $every,
@ -267,10 +267,10 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
$tpl = get_markup_template("group_side.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Channel Groups'),
'$edittext' => t('Edit channel group'),
'$createtext' => t('Create a new channel group'),
'$ungrouped' => (($every === 'contacts') ? t('Channels not in any group') : ''),
'$title' => t('Collections'),
'$edittext' => t('Edit collection'),
'$createtext' => t('Create a new collection'),
'$ungrouped' => (($every === 'contacts') ? t('Channels not in any collection') : ''),
'$groups' => $groups,
'$add' => t('add'),
));

10
include/nav.php
View File

@ -149,18 +149,18 @@ EOT;
$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
$nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message'));
$nav['manage'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'));
$nav['manage'] = array('manage', t('Channel Select'), "", t('Manage Your Channels'));
$nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
$nav['contacts'] = array('connections', t('Connections'),"", t('Manage/edit friends and channels'));
$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'));
$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles'));
$nav['contacts'] = array('connections', t('Connections'),"", t('Manage/Edit Friends and Connections'));
}
/**
* Admin page
*/
if (is_site_admin()){
$nav['admin'] = array('admin/', t('Admin'), "", t('Site setup and configuration'));
$nav['admin'] = array('admin/', t('Admin'), "", t('Site Setup and Configuration'));
}

34
mod/group.php
View File

@ -7,7 +7,7 @@ function validate_members(&$item) {
function group_init(&$a) {
if(local_user()) {
require_once('include/group.php');
$a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0));
$a->page['aside'] = group_side('collections','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0));
}
}
@ -26,15 +26,15 @@ function group_post(&$a) {
$name = notags(trim($_POST['groupname']));
$r = group_add(local_user(),$name);
if($r) {
info( t('Group created.') . EOL );
info( t('Collection created.') . EOL );
$r = group_byname(local_user(),$name);
if($r)
goaway($a->get_baseurl() . '/group/' . $r);
}
else
notice( t('Could not create group.') . EOL );
notice( t('Could not create collection.') . EOL );
goaway($a->get_baseurl() . '/group');
return; // NOTREACHED
}
if(($a->argc == 2) && (intval($a->argv[1]))) {
check_form_security_token_redirectOnErr('/group', 'group_edit');
@ -44,9 +44,9 @@ function group_post(&$a) {
intval(local_user())
);
if(! count($r)) {
notice( t('Channel group not found.') . EOL );
goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED
notice( t('Collection not found.') . EOL );
goaway($a->get_baseurl() . '/connections');
}
$group = $r[0];
$groupname = notags(trim($_POST['groupname']));
@ -57,7 +57,7 @@ function group_post(&$a) {
intval($group['id'])
);
if($r)
info( t('Channel group name changed.') . EOL );
info( t('Collection name changed.') . EOL );
}
$a->page['aside'] = group_side();
@ -87,8 +87,8 @@ function group_content(&$a) {
if(($a->argc == 2) && ($a->argv[1] === 'new')) {
return replace_macros($tpl, $context + array(
'$title' => t('Create a group of contacts/friends.'),
'$gname' => array('groupname',t('Channel Group Name: '), '', ''),
'$title' => t('Create a collection of connections.'),
'$gname' => array('groupname',t('Collection Name: '), '', ''),
'$gid' => 'new',
'$form_security_token' => get_form_security_token("group_edit"),
));
@ -107,9 +107,9 @@ function group_content(&$a) {
if(count($r))
$result = group_rmv(local_user(),$r[0]['name']);
if($result)
info( t('Channel group removed.') . EOL);
info( t('Collection removed.') . EOL);
else
notice( t('Unable to remove channel group.') . EOL);
notice( t('Unable to remove collection.') . EOL);
}
goaway($a->get_baseurl() . '/group');
// NOTREACHED
@ -134,8 +134,8 @@ function group_content(&$a) {
intval(local_user())
);
if(! count($r)) {
notice( t('Channel group not found.') . EOL );
goaway($a->get_baseurl() . '/contacts');
notice( t('Collection not found.') . EOL );
goaway($a->get_baseurl() . '/connnections');
}
$group = $r[0];
$members = group_get_members($group['id']);
@ -173,8 +173,8 @@ function group_content(&$a) {
$context = $context + array(
'$title' => t('Contact Group Editor'),
'$gname' => array('groupname',t('Channel Group Name: '),$group['name'], ''),
'$title' => t('Collection Editor'),
'$gname' => array('groupname',t('Collection Name: '),$group['name'], ''),
'$gid' => $group['id'],
'$drop' => $drop_txt,
'$form_security_token' => get_form_security_token('group_edit'),
@ -188,7 +188,7 @@ function group_content(&$a) {
$groupeditor = array(
'label_members' => t('Members'),
'members' => array(),
'label_contacts' => t('All Active Channels'),
'label_contacts' => t('All Connected Channels'),
'contacts' => array(),
);