diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-08-17 17:35:37 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-08-17 17:35:37 +0200 |
| commit | bdf42473a0341f291cd256323d122aa80bb0cb0b (patch) | |
| tree | 922a5ba24a34d7ea89673019e82f68436edb7091 /mod/profiles.php | |
| parent | 6c423feed2d8bc5bd36d2a1cbac073915e523749 (diff) | |
| parent | db03b1ab173d61b1ee75271dac1e48f3475ad42c (diff) | |
| download | volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.gz volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.bz2 volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'mod/profiles.php')
| -rw-r--r-- | mod/profiles.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/profiles.php b/mod/profiles.php index 7041249e2..9b0a2970b 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -361,6 +361,9 @@ function profiles_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); $a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"include/country.js\" ></script>"; + $f = get_config('system','birthday_input_format'); + if(! $f) + $f = 'ymd'; $is_default = (($r[0]['is-default']) ? 1 : 0); $tpl = get_markup_template("profile_edit.tpl"); @@ -375,7 +378,7 @@ function profiles_content(&$a) { '$lbl_fullname' => t('Your Full Name:'), '$lbl_title' => t('Title/Description:'), '$lbl_gender' => t('Your Gender:'), - '$lbl_bd' => t("Birthday \x28y/m/d\x29:"), + '$lbl_bd' => sprintf( t("Birthday \x28%s\x29:"),datesel_format($f)), '$lbl_address' => t('Street Address:'), '$lbl_city' => t('Locality/City:'), '$lbl_zip' => t('Postal/Zip Code:'), @@ -466,7 +469,7 @@ function profiles_content(&$a) { '$id' => $rr['id'], '$alt' => t('Profile Image'), '$profile_name' => $rr['profile-name'], - '$visible' => (($rr['is-default']) ? '<strong>' . t('Visible to everybody') . '</strong>' + '$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>' : '<a href="' . $a->get_baseurl() . '/profperm/' . $rr['id'] . '" />' . t('Edit visibility') . '</a>') )); } |