From a6c4ae186e9e9962ce9ea364a95b49b5e2cbc81d Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 19 Oct 2014 11:09:51 +0200 Subject: Don't display date format, it's already in the placeholder text --- include/datetime.php | 30 ------------------------------ mod/events.php | 6 ------ mod/profiles.php | 2 +- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 76c3ddb25..fe0f29c7a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -140,36 +140,6 @@ function dob($dob) { } -function datesel_format($f) { - - $o = ''; - - if(strlen($f)) { - for($x = 0; $x < strlen($f); $x ++) { - switch($f[$x]) { - case 'y': - if(strlen($o)) - $o .= '-'; - $o .= t('year'); - break; - case 'm': - if(strlen($o)) - $o .= '-'; - $o .= t('month'); - break; - case 'd': - if(strlen($o)) - $o .= '-'; - $o .= t('day'); - break; - default: - break; - } - } - } - return $o; -} - /** * returns a date selector * @param $format diff --git a/mod/events.php b/mod/events.php index 459ed05bb..86a2286b2 100755 --- a/mod/events.php +++ b/mod/events.php @@ -520,11 +520,6 @@ function events_content(&$a) { } } - - - $dateformat = datesel_format($f); - $timeformat = t('hour:minute'); - require_once('include/acl_selectors.php'); $perm_defaults = array( @@ -544,7 +539,6 @@ function events_content(&$a) { '$mid' => $mid, '$title' => t('Event details'), - '$format_desc' => sprintf( t('Format is %s %s.'),$dateformat,$timeformat), '$desc' => t('Starting date and Title are required.'), '$catsenabled' => $catsenabled, '$placeholdercategory' => t('Categories (comma-separated list)'), diff --git a/mod/profiles.php b/mod/profiles.php index b23ae5cc5..14f24c5cf 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -626,7 +626,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); '$lbl_fullname' => t('Your Full Name:'), '$lbl_title' => t('Title/Description:'), '$lbl_gender' => t('Your Gender:'), - '$lbl_bd' => sprintf( t("Birthday \x28%s\x29:"),datesel_format($f)), + '$lbl_bd' => t("Birthday :"), '$lbl_address' => t('Street Address:'), '$lbl_city' => t('Locality/City:'), '$lbl_zip' => t('Postal/Zip Code:'), -- cgit v1.2.3