commit 3d27a87346f6ffd59a9446d057fc7605e99f4c1f
Author: Sally Young <sally@justafish.co.uk>
Date:   Sat Sep 8 13:40:26 2012 +0100

    1571632-83

diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 1bca60f..9a7246f 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2203,7 +2203,7 @@ function drupal_bootstrap($phase = NULL, $new_phase = TRUE) {
  */
 function drupal_get_user_timezone() {
   global $user;
-  $config = config('system.regional');
+  $config = config('system.date');
   if ($config->get('timezone.user.configurable') && $user->uid && $user->timezone) {
     return $user->timezone;
   }
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 2a1a8ad..6c50d7a 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1886,7 +1886,7 @@ function _install_configure_form($form, &$form_state, &$install_state) {
     '#type' => 'select',
     '#title' => st('Default country'),
     '#empty_value' => '',
-    '#default_value' => config('system.regional')->get('country.default'),
+    '#default_value' => config('system.date')->get('country.default'),
     '#options' => $countries,
     '#description' => st('Select the default country for the site.'),
     '#weight' => 0,
@@ -1952,7 +1952,7 @@ function install_configure_form_submit($form, &$form_state) {
     ->set('mail', $form_state['values']['site_mail'])
     ->save();
 
-  config('system.regional')
+  config('system.date')
     ->set('timezone.default', $form_state['values']['date_default_timezone'])
     ->set('country.default', $form_state['values']['site_default_country'])
     ->save();
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index e4a8a25..1c077bb 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -491,7 +491,7 @@ function locale_library_info_alter(&$libraries, $module) {
           'ui' => array(
             'datepicker' => array(
               'isRTL' => $language_interface->direction == LANGUAGE_RTL,
-              'firstDay' => config('system.regional')->get('date.first_day'),
+              'firstDay' => config('system.date')->get('first_day'),
             ),
           ),
         ),
diff --git a/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
index b776161..0e29aab 100644
--- a/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
+++ b/core/modules/openid/lib/Drupal/openid/Tests/OpenIDRegistrationTest.php
@@ -42,7 +42,7 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
   function testRegisterUserWithEmailVerification() {
     config('user.settings')->set('verify_mail', TRUE)->save();
 
-    config('system.regional')
+    config('system.date')
       ->set('timezone.user.configurable', 1)
       ->set('timezone.default', 'Europe/Brussels')
       ->save();
@@ -102,7 +102,7 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
   function testRegisterUserWithoutEmailVerification() {
     config('user.settings')->set('verify_mail', FALSE)->save();
 
-    config('system.regional')
+    config('system.date')
       ->set('timezone.user.configurable', 1)
       ->set('timezone.default', 'Europe/Brussels')
       ->save();
@@ -145,7 +145,7 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
    * information (a username that is already taken, and no e-mail address).
    */
   function testRegisterUserWithInvalidSreg() {
-    config('system.regional')
+    config('system.date')
       ->set('timezone.user.configurable', 1)
       ->set('timezone.default', 'Europe/Brussels')
       ->save();
@@ -237,7 +237,7 @@ class OpenIDRegistrationTest extends OpenIDTestBase {
    */
   function testRegisterUserWithAXButNoSREG() {
     config('user.settings')->set('verify_mail', FALSE)->save();
-    config('system.regional')
+    config('system.date')
       ->set('timezone.default', 'Europe/Brussels')
       ->save();
 
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index c30c76a..39c7971 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -700,7 +700,7 @@ abstract class WebTestBase extends TestBase {
     // Restore necessary variables.
     variable_set('install_task', 'done');
     config('system.site')->set('mail', 'simpletest@example.com')->save();
-    config('system.regional')->set('timezone.default', date_default_timezone_get())->save();
+    config('system.date')->set('timezone.default', date_default_timezone_get())->save();
 
     // Set up English language.
     unset($conf['language_default']);
diff --git a/core/modules/system/config/system.date.yml b/core/modules/system/config/system.date.yml
new file mode 100644
index 0000000..f4a2dd9
--- /dev/null
+++ b/core/modules/system/config/system.date.yml
@@ -0,0 +1,9 @@
+first_day: '0'
+country:
+    default: ''
+timezone:
+    default: ''
+    user:
+        configurable: '1'
+        default: '0'
+        warn: '0'
diff --git a/core/modules/system/config/system.regional.yml b/core/modules/system/config/system.regional.yml
deleted file mode 100644
index f1360c1..0000000
--- a/core/modules/system/config/system.regional.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-country:
-    default: ''
-date:
-    first_day: '0'
-timezone:
-    default: ''
-    user:
-        configurable: '1'
-        default: '0'
-        warn: '0'
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
index a746411..ce72da6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/FormatDateTest.php
@@ -36,7 +36,7 @@ class FormatDateTest extends WebTestBase {
 
   function setUp() {
     parent::setUp('language');
-    config('system.regional')->set('timezone.user.configurable', 1)->save();
+    config('system.date')->set('timezone.user.configurable', 1)->save();
     variable_set('date_format_long', 'l, j. F Y - G:i');
     variable_set('date_format_medium', 'j. F Y - G:i');
     variable_set('date_format_short', 'Y M j - g:ia');
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
index 960b4aa..3c637e2 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/DateTimeTest.php
@@ -44,7 +44,7 @@ class DateTimeTest extends WebTestBase {
    */
   function testTimeZoneHandling() {
     // Setup date/time settings for Honolulu time.
-    $config = config('system.regional')
+    $config = config('system.date')
       ->set('timezone.default', 'Pacific/Honolulu')
       ->set('timezone.user.configurable', 0)
       ->save();
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 791d455..6ea4104 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -1963,7 +1963,7 @@ function system_rss_feeds_settings_submit($form, &$form_state) {
  */
 function system_regional_settings($form, &$form_state) {
   $countries = country_get_list();
-  $config = config('system.regional');
+  $config = config('system.date');
 
   // Date settings:
   $zones = system_time_zones();
@@ -1985,7 +1985,7 @@ function system_regional_settings($form, &$form_state) {
   $form['locale']['date_first_day'] = array(
     '#type' => 'select',
     '#title' => t('First day of week'),
-    '#default_value' => $config->get('date.first_day'),
+    '#default_value' => $config->get('first_day'),
     '#options' => array(0 => t('Sunday'), 1 => t('Monday'), 2 => t('Tuesday'), 3 => t('Wednesday'), 4 => t('Thursday'), 5 => t('Friday'), 6 => t('Saturday')),
   );
 
@@ -2048,9 +2048,9 @@ function system_regional_settings($form, &$form_state) {
  * @see system_regional_settings()
  */
 function system_regional_settings_submit($form, &$form_state) {
-  config('system.regional')
+  config('system.date')
     ->set('country.default', $form_state['values']['site_default_country'])
-    ->set('date.first_day', $form_state['values']['date_first_day'])
+    ->set('first_day', $form_state['values']['date_first_day'])
     ->set('timezone.default', $form_state['values']['date_default_timezone'])
     ->set('timezone.user.configurable', $form_state['values']['configurable_timezones'])
     ->set('timezone.user.warn', $form_state['values']['empty_timezone_message'])
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 4c6ae3d..44c5e40 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1898,10 +1898,10 @@ function system_update_8019() {
  *
  * @ingroup config_upgrade
  */
-function system_update_8018() {
-  update_variables_to_config('system.regional', array(
+function system_update_8020() {
+  update_variables_to_config('system.date', array(
     'site_default_country' => 'country.default',
-    'date_first_day' => 'date.first_day',
+    'date_first_day' => 'first_day',
     'date_default_timezone' => 'timezone.default',
     'configurable_timezones' => 'timezone.user.configurable',
     'empty_timezone_message' => 'timezone.user.warn',
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 9d27ffa..cde148c 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -2349,7 +2349,7 @@ function system_custom_theme() {
  * Implements hook_form_FORM_ID_alter().
  */
 function system_form_user_profile_form_alter(&$form, &$form_state) {
-  if (config('system.regional')->get('timezone.user.configurable')) {
+  if (config('system.date')->get('timezone.user.configurable')) {
     system_user_timezone($form, $form_state);
   }
   return $form;
@@ -2359,7 +2359,7 @@ function system_form_user_profile_form_alter(&$form, &$form_state) {
  * Implements hook_form_FORM_ID_alter().
  */
 function system_form_user_register_form_alter(&$form, &$form_state) {
-  $config = config('system.regional');
+  $config = config('system.date');
   if ($config->get('timezone.user.configurable') && $config->get('timezone.user.default') == DRUPAL_USER_TIMEZONE_SELECT) {
     system_user_timezone($form, $form_state);
     return $form;
@@ -2370,7 +2370,7 @@ function system_form_user_register_form_alter(&$form, &$form_state) {
  * Implements hook_user_presave().
  */
 function system_user_presave($account) {
-  $config = config('system.regional');
+  $config = config('system.date');
   if ($config->get('timezone.user.configurable') && empty($account->timezone) && !$config->get('timezone.user.default')) {
     $account->timezone = $config->get('timezone.default');
   }
@@ -2380,7 +2380,7 @@ function system_user_presave($account) {
  * Implements hook_user_login().
  */
 function system_user_login(&$edit, $account) {
-  $config = config('system.regional');
+  $config = config('system.date');
   // If the user has a NULL time zone, notify them to set a time zone.
   if (!$account->timezone && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) {
     drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
@@ -2403,7 +2403,7 @@ function system_user_timezone(&$form, &$form_state) {
   $form['timezone']['timezone'] = array(
     '#type' => 'select',
     '#title' => t('Time zone'),
-    '#default_value' => isset($account->timezone) ? $account->timezone : ($account->uid == $user->uid ? config('system.regional')->get('timezone.default') : ''),
+    '#default_value' => isset($account->timezone) ? $account->timezone : ($account->uid == $user->uid ? config('system.date')->get('timezone.default') : ''),
     '#options' => system_time_zones($account->uid != $user->uid),
     '#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
   );
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
index 051f801..06f9a8e 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserRegistrationTest.php
@@ -157,7 +157,7 @@ class UserRegistrationTest extends WebTestBase {
       ->save();
 
     // Set the default timezone to Brussels.
-    $config_system_regional = config('system.regional')
+    $config_system_date = config('system.date')
       ->set('timezone.user.configurable', 1)
       ->set('timezone.default', 'Europe/Brussels')
       ->save();
@@ -183,7 +183,7 @@ class UserRegistrationTest extends WebTestBase {
     $this->assertEqual($new_user->signature, '', t('Correct signature field.'));
     $this->assertTrue(($new_user->created > REQUEST_TIME - 20 ), t('Correct creation time.'));
     $this->assertEqual($new_user->status, $config_user_settings->get('register') == USER_REGISTER_VISITORS ? 1 : 0, t('Correct status field.'));
-    $this->assertEqual($new_user->timezone, $config_system_regional->get('timezone.default'), t('Correct time zone field.'));
+    $this->assertEqual($new_user->timezone, $config_system_date->get('timezone.default'), t('Correct time zone field.'));
     $this->assertEqual($new_user->langcode, language_default()->langcode, t('Correct language field.'));
     $this->assertEqual($new_user->preferred_langcode, language_default()->langcode, t('Correct preferred language field.'));
     $this->assertEqual($new_user->picture, 0, t('Correct picture field.'));
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php b/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
index 6969a42..f739236 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserTimeZoneTest.php
@@ -26,7 +26,7 @@ class UserTimeZoneTest extends WebTestBase {
    */
   function testUserTimeZone() {
     // Setup date/time settings for Los Angeles time.
-    $config = config('system.regional')
+    $config = config('system.date')
       ->set('timezone.user.configurable', 1)
       ->set('timezone.default', 'America/Los_Angeles')
       ->save();
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index e213fe5..ddf35a4 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -297,7 +297,7 @@ function hook_user_update($account) {
  *   The user object on which the operation was just performed.
  */
 function hook_user_login(&$edit, $account) {
-  $config = config('system.regional');
+  $config = config('system.date');
   // If the user has a NULL time zone, notify them to set a time zone.
   if (!$account->timezone && $config->get('timezone.user.configurable') && $config->get('timezone.user.warn')) {
     drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));