diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-13 18:16:11 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-13 18:16:11 -0700 |
| commit | 2f5862713e2fb959134c2de23ca4ef9907912030 (patch) | |
| tree | 738f5dae5b779dae9e4ee6add0bc1fdda73312a5 /mod/profiles.php | |
| parent | 6729c27b771c35a3153ffcbcdef75164426bbf74 (diff) | |
| parent | fbfa3919650f1561a8a6037977d35c7581209d3b (diff) | |
| download | volse-hubzilla-2f5862713e2fb959134c2de23ca4ef9907912030.tar.gz volse-hubzilla-2f5862713e2fb959134c2de23ca4ef9907912030.tar.bz2 volse-hubzilla-2f5862713e2fb959134c2de23ca4ef9907912030.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/profiles.php')
| -rw-r--r-- | mod/profiles.php | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/mod/profiles.php b/mod/profiles.php index f6d75bb7e..209a7a32d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -641,7 +641,7 @@ function profiles_content(&$a) { $hide_friends = array( 'hide_friends', - t('Hide your contact/friend list from viewers of this profile?'), + t('Hide your connections list from viewers of this profile'), $r[0]['hide_friends'], '', array(t('No'),t('Yes')) @@ -696,18 +696,12 @@ function profiles_content(&$a) { '$lbl_import' => t('Import profile from file'), '$lbl_export' => t('Export profile to file'), '$lbl_gender' => t('Your Gender'), - '$lbl_address' => t('Street Address'), - '$lbl_city' => t('Locality/City'), - '$lbl_zip' => t('Postal/Zip Code'), - '$lbl_country' => t('Country'), - '$lbl_region' => t('Region/State'), '$lbl_marital' => t('<span class="heart">♥</span> Marital Status'), '$lbl_with' => t("Who (if applicable)"), '$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'), '$lbl_howlong' => t('Since [date]'), '$lbl_sexual' => t('Sexual Preference'), '$lbl_homepage' => t('Homepage URL'), - '$lbl_hometown' => t('Hometown'), '$lbl_politic' => t('Political Views'), '$lbl_religion' => t('Religious Views'), '$lbl_pubkey' => t('Keywords'), @@ -737,22 +731,22 @@ function profiles_content(&$a) { '$pdesc' => array('pdesc', t('Title/Description'), $r[0]['pdesc']), '$dob' => dob($r[0]['dob']), '$hide_friends' => $hide_friends, - '$address' => $r[0]['address'], - '$locality' => $r[0]['locality'], - '$region' => $r[0]['region'], - '$postal_code' => $r[0]['postal_code'], - '$country_name' => $r[0]['country_name'], + '$address' => array('address', t('Street Address'), $r[0]['address']), + '$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']), '$gender' => gender_selector($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']), + '$marital_min' => marital_selector_min($r[0]['marital']), '$with' => $r[0]['with'], '$howlong' => ($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']), + '$sexual_min' => sexpref_selector_min($r[0]['sexual']), '$about' => $r[0]['about'], '$homepage' => $r[0]['homepage'], - '$hometown' => $r[0]['hometown'], + '$hometown' => array('hometown', t('Hometown'), $r[0]['hometown']), '$politic' => $r[0]['politic'], '$religion' => $r[0]['religion'], '$keywords' => $r[0]['keywords'], |