diff --git a/src/cambridge/cambridge.install b/src/cambridge/cambridge.install index 5ccb848d42c4ae384b2577509d518e23ebd3b9db..80b457209e9a7cc15f8d3ed349e7886e65390c71 100644 --- a/src/cambridge/cambridge.install +++ b/src/cambridge/cambridge.install @@ -472,3 +472,12 @@ function cambridge_update_7106() { } filter_formats_reset(); } + +/** + * Set date formats to UK style. + */ +function cambridge_update_7107() { + require_once 'cambridge_base.inc'; + + cambridge_base_set_up_date_formats(); +} diff --git a/src/cambridge_base.inc b/src/cambridge_base.inc index 52022d834e04071895196f30267f5677e5df83c6..caeb2237b8187a59ce37177224d13765cd29b0c8 100644 --- a/src/cambridge_base.inc +++ b/src/cambridge_base.inc @@ -572,6 +572,9 @@ function cambridge_base_install() { // Set some sensible defaults for the Views module. variable_set('views_ui_show_advanced_help_warning', 0); + + // Set date formats to UK style. + cambridge_base_set_up_date_formats(); } /** @@ -646,3 +649,32 @@ function cambridge_base_set_up_focus_on_teasers() { field_update_instance($instance); } } + +/** + * Set date formats to UK style. + */ +function cambridge_base_set_up_date_formats() { + if (TRUE === module_exists('locale')) { + // Something has been done with locales, so abort. + return; + } + + if ('Europe/London' !== variable_get('date_default_timezone', 'Europe/London')) { + return; + } + + if ( + 'l, F j, Y - H:i' !== variable_get('date_format_long', 'l, F j, Y - H:i') + || + 'D, m/d/Y - H:i' !== variable_get('date_format_medium', 'D, m/d/Y - H:i') + || + 'm/d/Y - H:i' !== variable_get('date_format_short', 'm/d/Y - H:i') + ) { + // One of the Drupal defaults has changed, so abort. + return; + } + + variable_set('date_format_long', 'l, j F, Y - H:i'); + variable_set('date_format_medium', 'D, d/m/Y - H:i'); + variable_set('date_format_short', 'd/m/Y - H:i'); +} diff --git a/src/cambridge_lite/cambridge_lite.install b/src/cambridge_lite/cambridge_lite.install index 8e2a427072b7eab2e50af75d3a0ff189173a15e5..133a86ad010e01a6f8802bc26baafcc17da6fb33 100644 --- a/src/cambridge_lite/cambridge_lite.install +++ b/src/cambridge_lite/cambridge_lite.install @@ -26,3 +26,12 @@ function cambridge_lite_update_7100() { cambridge_base_set_up_focus_on_teasers(); } + +/** + * Set date formats to UK style. + */ +function cambridge_lite_update_7101() { + require_once 'cambridge_base.inc'; + + cambridge_base_set_up_date_formats(); +}