Merge https://github.com/redmatrix/hubzilla into pending_merge

1 files changed, 19 insertions, 39 deletions

diff --git a/mod/profiles.php b/mod/profiles.php
index c135814a8..c3f5679fe 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -686,7 +686,7 @@ function profiles_content(&$a) {
 			'$banner'       => t('Edit Profile Details'),
 			'$submit'       => t('Submit'),
 			'$viewprof'     => t('View this profile'),
-			'$editvis' 	    => t('Edit visibility'),
+			'$editvis' 	=> t('Edit visibility'),
 			'$coverpic'     => t('Change Cover Photo'),
 			'$profpic'      => t('Change Profile Photo'),
 			'$cr_prof'      => t('Create a new profile using these settings'),
@@ -698,26 +698,6 @@ function profiles_content(&$a) {
 			'$lbl_gender'   => t('Your Gender'),
 			'$lbl_marital'  => t('Marital Status'),
 			'$lbl_sexual'   => t('Sexual Preference'),
-			'$lbl_homepage' => t('Homepage URL'),
-			'$lbl_politic'  => t('Political Views'),
-			'$lbl_religion' => t('Religious Views'),
-			'$lbl_pubkey'   => t('Keywords'),
-			'$lbl_likes'    => t('Likes'),
-			'$lbl_dislikes' => t('Dislikes'),
-			'$lbl_ex2'      => t('Example: fishing photography software'),
-			'$lbl_pubdsc'   => t("Used in directory listings"),
-			'$lbl_about'    => t('Tell us about yourself...'),
-			'$lbl_hobbies'  => t('Hobbies/Interests'),
-			'$lbl_social'   => t('Contact information and Social Networks'),
-			'$lbl_channels' => t('My other channels'),
-			'$lbl_music'    => t('Musical interests'),
-			'$lbl_book'     => t('Books, literature'),
-			'$lbl_tv'       => t('Television'),
-			'$lbl_film'     => t('Film/dance/culture/entertainment'),
-			'$lbl_love'     => t('Love/romance'),
-			'$lbl_work'     => t('Work/employment'),
-			'$lbl_school'   => t('School/education'),
-			'$disabled'     => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
 			'$baseurl'      => $a->get_baseurl(true),
 			'$profile_id'   => $r[0]['id'],
 			'$profile_name' => array('profile_name', t('Profile Name'), $r[0]['profile_name'], '', '*'),
@@ -732,7 +712,7 @@ function profiles_content(&$a) {
 			'$locality'     => array('locality', t('Locality/City'), $r[0]['locality']),
 			'$region'       => array('region', t('Region/State'), $r[0]['region']),
 			'$postal_code'  => array('postal_code', t('Postal/Zip Code'), $r[0]['postal_code']),
-			'$country_name' => array('country', t('Country'), $r[0]['country_name']),
+			'$country_name' => array('country_name', t('Country'), $r[0]['country_name']),
 			'$gender'       => gender_selector($r[0]['gender']),
 			'$gender_min'   => gender_selector_min($r[0]['gender']),
 			'$marital'      => marital_selector($r[0]['marital']),
@@ -741,24 +721,24 @@ function profiles_content(&$a) {
 			'$howlong'      => array('howlong', t('Since (date)'), ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
 			'$sexual'       => sexpref_selector($r[0]['sexual']),
 			'$sexual_min'   => sexpref_selector_min($r[0]['sexual']),
-			'$about'        => $r[0]['about'],
-			'$homepage'     => $r[0]['homepage'],
+			'$about'        => array('about', t('Tell us about yourself'), $r[0]['about']),
+			'$homepage'     => array('homepage', t('Homepage URL'), $r[0]['homepage']),
 			'$hometown'     => array('hometown', t('Hometown'), $r[0]['hometown']),
-			'$politic'      => $r[0]['politic'],
-			'$religion'     => $r[0]['religion'],
-			'$keywords'     => $r[0]['keywords'],
-			'$likes'        => $r[0]['likes'],
-			'$dislikes'     => $r[0]['dislikes'],
-			'$music'        => $r[0]['music'],
-			'$book'         => $r[0]['book'],
-			'$tv'           => $r[0]['tv'],
-			'$film'         => $r[0]['film'],
-			'$interest'     => $r[0]['interest'],
-			'$romance'      => $r[0]['romance'],
-			'$work'         => $r[0]['work'],
-			'$education'    => $r[0]['education'],
-			'$contact'      => $r[0]['contact'],
-			'$channels'     => $r[0]['channels'],
+			'$politic'      => array('politic', t('Political Views'), $r[0]['politic']),
+			'$religion'     => array('religion', t('Religious Views'), $r[0]['religion']),
+			'$keywords'     => array('keywords',  t('Keywords used in directory listings'), $r[0]['keywords'], t('Example: fishing photography software')),
+			'$likes'        => array('likes', t('Likes'), $r[0]['likes']),
+			'$dislikes'     => array('dislikes', t('Dislikes'), $r[0]['dislikes']),
+			'$music'        => array('music', t('Musical interests'), $r[0]['music']),
+			'$book'         => array('book', t('Books, literature'), $r[0]['book']),
+			'$tv'           => array('tv', t('Television'), $r[0]['tv']),
+			'$film'         => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
+			'$interest'     => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
+			'$romance'      => array('romance',t('Love/romance'), $r[0]['romance']),
+			'$work'         => array('work', t('Work/employment'), $r[0]['work']),
+			'$education'    => array('education', t('School/education'), $r[0]['education']),
+			'$contact'      => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),
+			'$channels'     => array('channels', t('My other channels'), $r[0]['channels']),
 			'$extra_fields' => $extra_fields,
 		));