gunnar: server/kolab-webclient/horde/configuration/horde-3.3.6 10-kolab_prefs_base.php, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6
In directory doto:/tmp/cvs-serv17664/kolab-webclient/horde/configuration/horde-3.3.6

Modified Files:
	10-kolab_prefs_base.php 
Log Message:
Merge patches from the kolab_2_2 branch.

Index: 10-kolab_prefs_base.php
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/configuration/horde-3.3.6/10-kolab_prefs_base.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-kolab_prefs_base.php	12 Jan 2010 22:16:11 -0000	1.1
+++ 10-kolab_prefs_base.php	22 Jan 2010 19:59:49 -0000	1.2
@@ -1,5 +1,27 @@
 <?php
 
+$prefGroups['language'] = array(
+    'column' => _("Your Information"),
+    'label' => _("Locale and Time"),
+    'desc' => _("Set your preferred language, timezone and date options."),
+    'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'date_input_format', 'first_week_day')
+);
+
+// date input format
+$_prefs['date_input_format'] = array(
+    'value' => 'year-month-day',
+    'locked' => false,
+    'shared' => true,
+    'type' => 'enum',
+    'enum' => array(
+        'day-month-year' => strftime('%d %b %Y'),
+        'month-day-year' => strftime('%b %d %Y'),
+        'year-day-month' => strftime('%Y %d %b'),
+        'year-month-day' => strftime('%Y %b %d'),
+    ),
+    'desc' => _("Choose order how to enter dates:"),
+);
+
 // user full name for From: line
 // If you lock this preference, you must specify a value or a hook for it in
 // horde/config/hooks.php.