aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-25 20:59:25 -0700
committerFriendika <info@friendika.com>2011-07-25 20:59:25 -0700
commit454ff3c7f0a4729dbf9a9dd116325630a193f0fb (patch)
tree7c93cb913663267443736ed98de935a93706ba3e /mod
parent1441fce04eb0a95756661e54cbc22dff2e275c21 (diff)
downloadvolse-hubzilla-454ff3c7f0a4729dbf9a9dd116325630a193f0fb.tar.gz
volse-hubzilla-454ff3c7f0a4729dbf9a9dd116325630a193f0fb.tar.bz2
volse-hubzilla-454ff3c7f0a4729dbf9a9dd116325630a193f0fb.zip
configurable format for date input selectors
Diffstat (limited to 'mod')
-rw-r--r--mod/events.php12
-rw-r--r--mod/profiles.php5
2 files changed, 13 insertions, 4 deletions
diff --git a/mod/events.php b/mod/events.php
index b0b54601f..27ca69830 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -297,6 +297,12 @@ function events_content(&$a) {
$fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
+ $f = get_config('system','event_input_format');
+ if(! $f)
+ $f = 'ymd';
+
+ $dateformat = datesel_format($f);
+ $timeformat = t('hour:minute');
require_once('include/acl_selectors.php');
@@ -306,14 +312,14 @@ function events_content(&$a) {
'$cid' => $cid,
'$uri' => $uri,
'$e_text' => t('Event details'),
- '$e_desc' => t('Format is year-month-day hour:minute. Starting date and Description are required.'),
+ '$e_desc' => sprintf( t('Format is %s %s. Starting date and Description are required.'),$dateformat,$timeformat),
'$s_text' => t('Event Starts:') . ' <span class="required">*</span> ',
- '$s_dsel' => datesel('start',$syear+5,$syear,false,$syear,$smonth,$sday),
+ '$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday),
'$s_tsel' => timesel('start',$shour,$sminute),
'$n_text' => t('Finish date/time is not known or not relevant'),
'$n_checked' => $n_checked,
'$f_text' => t('Event Finishes:'),
- '$f_dsel' => datesel('finish',$fyear+5,$fyear,false,$fyear,$fmonth,$fday),
+ '$f_dsel' => datesel($f,'finish',$fyear+5,$fyear,false,$fyear,$fmonth,$fday),
'$f_tsel' => timesel('finish',$fhour,$fminute),
'$a_text' => t('Adjust for viewer timezone'),
'$a_checked' => $a_checked,
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:'),