aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profiles.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-12 16:47:11 -0800
committerredmatrix <git@macgirvin.com>2016-03-12 16:47:11 -0800
commit70ad69d38c53f78d04d912495f63c6fb781f0550 (patch)
tree19c7a8282113431e6a4e47a256925d2aef6fb66f /mod/profiles.php
parentcb0c43bc6805721cd298796aa028d96398122e7a (diff)
parent7efffbf102d7954a973816c75054bed7fdefebf6 (diff)
downloadvolse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.tar.gz
volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.tar.bz2
volse-hubzilla-70ad69d38c53f78d04d912495f63c6fb781f0550.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/profiles.php')
-rw-r--r--mod/profiles.php29
1 files changed, 12 insertions, 17 deletions
diff --git a/mod/profiles.php b/mod/profiles.php
index 57d3561b1..f6d75bb7e 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -639,14 +639,13 @@ function profiles_content(&$a) {
else
$fields = $profile_fields_basic;
-
- $opt_tpl = get_markup_template("profile_hide_friends.tpl");
- $hide_friends = replace_macros($opt_tpl,array('$field' => array(
- 'hide_friends',
- t('Hide your contact/friend list from viewers of this profile?'),
- $r[0]['hide_friends'],
- '',
- )));
+ $hide_friends = array(
+ 'hide_friends',
+ t('Hide your contact/friend list from viewers of this profile?'),
+ $r[0]['hide_friends'],
+ '',
+ array(t('No'),t('Yes'))
+ );
$q = q("select * from profdef where true");
if($q) {
@@ -672,6 +671,7 @@ function profiles_content(&$a) {
$f = 'ymd';
$is_default = (($r[0]['is_default']) ? 1 : 0);
+
$tpl = get_markup_template("profile_edit.tpl");
$o .= replace_macros($tpl,array(
@@ -695,11 +695,7 @@ function profiles_content(&$a) {
'$exportable' => feature_enabled(local_channel(),'profile_export'),
'$lbl_import' => t('Import profile from file'),
'$lbl_export' => t('Export profile to file'),
- '$lbl_profname' => t('Profile Name'),
- '$lbl_fullname' => t('Your Full Name'),
- '$lbl_title' => t('Title/Description'),
'$lbl_gender' => t('Your Gender'),
- '$lbl_bd' => t("Birthday"),
'$lbl_address' => t('Street Address'),
'$lbl_city' => t('Locality/City'),
'$lbl_zip' => t('Postal/Zip Code'),
@@ -733,12 +729,12 @@ function profiles_content(&$a) {
'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
'$baseurl' => $a->get_baseurl(true),
'$profile_id' => $r[0]['id'],
- '$profile_name' => $r[0]['profile_name'],
+ '$profile_name' => array('profile_name', t('Profile Name'), $r[0]['profile_name'], '', '*'),
'$is_default' => $is_default,
'$default' => t('This is your default profile.') . EOL . translate_scope(map_scope($channel['channel_r_profile'])),
'$advanced' => $advanced,
- '$name' => $r[0]['name'],
- '$pdesc' => $r[0]['pdesc'],
+ '$name' => array('name', t('Your Full Name'), $r[0]['name']),
+ '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']),
'$dob' => dob($r[0]['dob']),
'$hide_friends' => $hide_friends,
'$address' => $r[0]['address'],
@@ -746,9 +742,8 @@ function profiles_content(&$a) {
'$region' => $r[0]['region'],
'$postal_code' => $r[0]['postal_code'],
'$country_name' => $r[0]['country_name'],
- '$age' => ((intval($r[0]['dob'])) ? '(' . t('Age: ') . age($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
'$gender' => gender_selector($r[0]['gender']),
- '$gender_min' => gender_selector_min($r[0]['gender']),
+ '$gender_min' => gender_selector_min($r[0]['gender']),
'$marital' => marital_selector($r[0]['marital']),
'$marital_min' => marital_selector_min($r[0]['marital']),
'$with' => $r[0]['with'],