From a74fd27e5f238f91f39be14056692945eecedabc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 6 Jan 2010 11:35:01 -0800
Subject: Updated Kohana to r4737

---
 system/config/locale.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'system/config/locale.php')

diff --git a/system/config/locale.php b/system/config/locale.php
index a62b4c3e..3f73b8f1 100644
--- a/system/config/locale.php
+++ b/system/config/locale.php
@@ -1,7 +1,15 @@
 <?php defined('SYSPATH') OR die('No direct access allowed.');
 /**
- * @package  Core
+ * Set your default language and timezone here. For more information about
+ * i18n support see the [i18n] library.
  *
+ * @package    Kohana
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2009 Kohana Team
+ * @license    http://kohanaphp.com/license
+ */
+
+/**
  * Default language locale name(s).
  * First item must be a valid i18n directory name, subsequent items are alternative locales
  * for OS's that don't support the first (e.g. Windows). The first valid locale in the array will be used.
@@ -11,7 +19,8 @@ $config['language'] = array('en_US', 'English_United States');
 
 /**
  * Locale timezone. Defaults to the timezone you have set in your php config
- * This cannot be left empty, a valid timezone is required!
+ * 
+ * [!!] This cannot be left empty, a valid timezone is required!
  * @see http://php.net/timezones
  */
 $config['timezone'] = ini_get('date.timezone');
\ No newline at end of file
-- 
cgit v1.2.3