aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profiles.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-07-29 17:23:09 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-07-29 17:23:09 +0200
commitac6945eed1644e7a9e58c5f74dae696ff0f09d72 (patch)
treeb3b13f5569869a2feffb3990ea8e33313f789e5e /mod/profiles.php
parentb1e766dadb1d4a9e727b2d1d5f32442392ac6bd3 (diff)
parentf47d582736ddf24528dd514850d4bed76783f589 (diff)
downloadvolse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.tar.gz
volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.tar.bz2
volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.zip
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'mod/profiles.php')
-rw-r--r--mod/profiles.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/profiles.php b/mod/profiles.php
index 160ca13bc..64fab797f 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:'),