2 commits - lib/client lib/locale

[Jeroen van Meeuwen]

 lib/client/kolab_client_task_user.php |   33 +++++++++++++++++++--------------
 lib/locale/en_US.php                  |    5 +++++
 2 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 6ca1a2a82f30ff60a0b353391272d1d78047281d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Apr 3 14:12:36 2012 +0200

    Move fields to a "Contact Information" tab

diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index 5ade938..184fbf6 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -193,10 +193,11 @@ class kolab_client_task_user extends kolab_client_task
 
         // Form sections
         $sections = array(
-            'personal' => 'user.personal',
-            'system'   => 'user.system',
-            'config'   => 'user.config',
-            'other'    => 'user.other',
+            'personal'      => 'user.personal',
+            'contact_info'  => 'user.contact_info',
+            'system'        => 'user.system',
+            'config'        => 'user.config',
+            'other'         => 'user.other',
         );
 
         // field-to-section map and fields order
@@ -209,23 +210,27 @@ class kolab_client_task_user extends kolab_client_task
             'cn'                        => 'personal',
             'initials'                  => 'personal',
             'title'                     => 'personal',
-            'telephonenumber'           => 'personal',
-            'facsimiletelephonenumber'  => 'personal',
             'o'                         => 'personal',
             'ou'                        => 'personal',
-            'roomnumber'                => 'personal',
-            'street'                    => 'personal',
-            'l'                         => 'personal',
-            'postofficebox'             => 'personal',
-            'postalcode'                => 'personal',
-            'c'                         => 'personal',
             'preferredlanguage'         => 'personal',
 
+            'c'                         => 'contact_info',
+            'facsimiletelephonenumber'  => 'contact_info',
+            'homephone'                 => 'contact_info',
+            'l'                         => 'contact_info',
+            'mail'                      => 'contact_info',
+            'mailalternateaddress'      => 'contact_info',
+            'mobile'                    => 'contact_info',
+            'pager'                     => 'contact_info',
+            'postalcode'                => 'contact_info',
+            'postofficebox'             => 'contact_info',
+            'roomnumber'                => 'contact_info',
+            'street'                    => 'contact_info',
+            'telephonenumber'           => 'contact_info',
+
             'uid'                       => 'system',
             'userpassword'              => 'system',
             'userpassword2'             => 'system',
-            'mail'                      => 'system',
-            'mailalternateaddress'      => 'system',
             'alias'                     => 'system',
             'mailhost'                  => 'system',
             'kolabhomeserver'           => 'system',
diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index bba8898..3e7fd71 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -46,6 +46,7 @@ $LANG['user.c'] = 'Country';
 $LANG['user.cn'] = 'Common name';
 $LANG['user.config'] = 'Configuration';
 $LANG['user.contact'] = 'Contact';
+$LANG['user.contact_info'] = 'Contact Information';
 $LANG['user.homephone'] = 'Home Phone Number';
 $LANG['user.kolabinvitationpolicy'] = 'Invitation Handling Policy';
 $LANG['user.l'] = 'City, Region';


commit c375b47f9ed2355ac9694ba8c3870e682b26504b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Apr 3 14:05:49 2012 +0200

    More translations

diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index e948e04..bba8898 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -46,13 +46,17 @@ $LANG['user.c'] = 'Country';
 $LANG['user.cn'] = 'Common name';
 $LANG['user.config'] = 'Configuration';
 $LANG['user.contact'] = 'Contact';
+$LANG['user.homephone'] = 'Home Phone Number';
+$LANG['user.kolabinvitationpolicy'] = 'Invitation Handling Policy';
 $LANG['user.l'] = 'City, Region';
 $LANG['user.list'] = 'Users List';
 $LANG['user.list.records'] = '$1 to $2 of $3';
+$LANG['user.mobile'] = 'Mobile Phone Number';
 $LANG['user.name'] = 'Name';
 $LANG['user.norecords'] = 'No user records found!';
 $LANG['user.other'] = 'Other';
 $LANG['user.o'] = 'Organization';
+$LANG['user.pager'] = 'Pager Number';
 $LANG['user.personal'] = 'Personal';
 $LANG['user.postalcode'] = 'Postal Code';
 $LANG['user.sn'] = 'Surname';