diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-09-12 17:18:36 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-09-12 17:18:36 +0000 |
| commit | 2446f32c920c4f2e7629d18485f2c4e6c0cecef2 (patch) | |
| tree | 88f027c9ed3d73f74213c735d49c5c7e9922c725 | |
| parent | d186dcc8c8ba9c6abb0e8db22e4259d17909b38b (diff) | |
| download | brdo-2446f32c920c4f2e7629d18485f2c4e6c0cecef2.tar.gz brdo-2446f32c920c4f2e7629d18485f2c4e6c0cecef2.tar.bz2 | |
- Renamed the 'first day of week' setting to be more consistent with the other date settings.
| -rw-r--r-- | modules/archive.module | 2 | ||||
| -rw-r--r-- | modules/archive/archive.module | 2 | ||||
| -rw-r--r-- | modules/system.module | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/archive.module b/modules/archive.module index b9347202b..2e6a78654 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -91,7 +91,7 @@ function archive_calendar($original = 0) { $output .= ' <caption>'. l('«', 'archive/'. date('Y/m/d', $prev), array('title' => t('Previous month'))) .' '. format_date($requested, 'custom', 'F') . date(' Y', $requested) .' '. ($nextmonth <= time() ? l('»', 'archive/'. date('Y/m/d', $next), array('title' => t('Next month'))) : ' ') ."</caption>\n"; // First day of week (0 => Sunday, 1 => Monday, ...) - $weekstart = variable_get('default_firstday', 0); + $weekstart = variable_get('date_first_day', 0); // Last day of week ($weekstart - 1 == -1) ? $lastday = 6 : $lastday = $weekstart - 1; diff --git a/modules/archive/archive.module b/modules/archive/archive.module index b9347202b..2e6a78654 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -91,7 +91,7 @@ function archive_calendar($original = 0) { $output .= ' <caption>'. l('«', 'archive/'. date('Y/m/d', $prev), array('title' => t('Previous month'))) .' '. format_date($requested, 'custom', 'F') . date(' Y', $requested) .' '. ($nextmonth <= time() ? l('»', 'archive/'. date('Y/m/d', $next), array('title' => t('Next month'))) : ' ') ."</caption>\n"; // First day of week (0 => Sunday, 1 => Monday, ...) - $weekstart = variable_get('default_firstday', 0); + $weekstart = variable_get('date_first_day', 0); // Last day of week ($weekstart - 1 == -1) ? $lastday = 6 : $lastday = $weekstart - 1; diff --git a/modules/system.module b/modules/system.module index e909c2762..4a1af86e1 100644 --- a/modules/system.module +++ b/modules/system.module @@ -241,7 +241,7 @@ function system_view_general() { $group .= form_select(t('Short date format'), 'date_format_short', variable_get('date_format_short', $dateshort[0]), $dateshortchoices, t('The short format of date display.')); $group .= form_select(t('Medium date format'), 'date_format_medium', variable_get('date_format_medium', $datemedium[0]), $datemediumchoices, t('The medium sized date display.')); $group .= form_select(t('Long date format'), 'date_format_long', variable_get('date_format_long', $datelong[0]), $datelongchoices, t('Longer date format used for detailed display.')); - $group .= form_select(t('First day of week'), 'default_firstday', variable_get('default_firstday', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week for calendar views.')); + $group .= form_select(t('First day of week'), 'date_first_day', variable_get('date_first_day', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week for calendar views.')); $output .= form_group(t('Date settings'), $group); diff --git a/modules/system/system.module b/modules/system/system.module index e909c2762..4a1af86e1 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -241,7 +241,7 @@ function system_view_general() { $group .= form_select(t('Short date format'), 'date_format_short', variable_get('date_format_short', $dateshort[0]), $dateshortchoices, t('The short format of date display.')); $group .= form_select(t('Medium date format'), 'date_format_medium', variable_get('date_format_medium', $datemedium[0]), $datemediumchoices, t('The medium sized date display.')); $group .= form_select(t('Long date format'), 'date_format_long', variable_get('date_format_long', $datelong[0]), $datelongchoices, t('Longer date format used for detailed display.')); - $group .= form_select(t('First day of week'), 'default_firstday', variable_get('default_firstday', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week for calendar views.')); + $group .= form_select(t('First day of week'), 'date_first_day', variable_get('date_first_day', 0), array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')), t('The first day of the week for calendar views.')); $output .= form_group(t('Date settings'), $group); |