2 commits - lib/client lib/locale

Aleksander Machniak machniak at kolabsys.com
Tue Oct 23 15:19:32 CEST 2012


 lib/client/kolab_client_task_settings.php |    3 +--
 lib/locale/en.php                         |    6 +++---
 lib/locale/en_US.php                      |    4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit bc65634037bca27a21b88af8cb92efd3c1dc61c9
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Oct 23 15:19:01 2012 +0200

    Fix char-case of attribute names and checking for required attributes

diff --git a/lib/client/kolab_client_task_settings.php b/lib/client/kolab_client_task_settings.php
index a6254f0..849bc90 100644
--- a/lib/client/kolab_client_task_settings.php
+++ b/lib/client/kolab_client_task_settings.php
@@ -837,9 +837,8 @@ class kolab_client_task_settings extends kolab_client_task
         if (!empty($response['list'])) {
             // remove objectClass
             $attributes = array_diff($response['list'], array('objectClass'));
-            $attributes = array_map('strtolower', $attributes);
             if (count($attributes)) {
-                $attributes = array_combine($attributes, $attributes);
+                $attributes = array_combine(array_map('strtolower', $attributes), $attributes);
             }
         }
 


commit 8beb6115d093a389fc2fda15a06d38ff21f9057e
Author: Aleksander Machniak <alec at alec.pl>
Date:   Tue Oct 23 15:11:26 2012 +0200

    Small improvements

diff --git a/lib/locale/en.php b/lib/locale/en.php
index 4527251..fb002ab 100644
--- a/lib/locale/en.php
+++ b/lib/locale/en.php
@@ -35,7 +35,7 @@ $LANG['group.add'] = 'Add Group';
 $LANG['group.add.success'] = 'Group created successfully.';
 $LANG['group.cn'] = 'Common name';
 $LANG['group.delete.success'] = 'Group deleted successfully.';
-$LANG['group.edit.success'] = 'Group edited successfully.';
+$LANG['group.edit.success'] = 'Group updated successfully.';
 $LANG['group.gidnumber'] = 'Primary group number';
 $LANG['group.list'] = 'Groups List';
 $LANG['group.list.records'] = '$1 to $2 of $3';
@@ -90,7 +90,7 @@ $LANG['resource.uniquemember'] = 'Collection Members';
 $LANG['role.add'] = 'Add Role';
 $LANG['role.cn'] = 'Role Name';
 $LANG['role.description'] = 'Role Description';
-$LANG['role.edit.success'] = 'Role edited successfully';
+$LANG['role.edit.success'] = 'Role updated successfully';
 $LANG['role.list'] = 'Role List';
 $LANG['role.list.records'] = '$1 to $2 of $3';
 $LANG['role.norecords'] = 'No role records found!';
@@ -162,7 +162,7 @@ $LANG['user.country'] = 'Country';
 $LANG['user.country.desc'] = '2 letter code from ISO 3166-1';
 $LANG['user.delete.success'] = 'User deleted successfully.';
 $LANG['user.displayname'] = 'Display name';
-$LANG['user.edit.success'] = 'User edited successfully.';
+$LANG['user.edit.success'] = 'User updated successfully.';
 $LANG['user.fax'] = 'Fax number';
 $LANG['user.fbinterval'] = 'Free-Busy interval';
 $LANG['user.fbinterval.desc'] = 'Leave blank for default (60 days)';
diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index d8911ab..798deb0 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -60,7 +60,7 @@ $LANG['group.add'] = 'Add Group';
 $LANG['group.add.success'] = 'Group created successfully.';
 $LANG['group.cn'] = 'Common name';
 $LANG['group.delete.success'] = 'Group deleted successfully.';
-$LANG['group.edit.success'] = 'Group edited successfully.';
+$LANG['group.edit.success'] = 'Group updated successfully.';
 $LANG['group.gidnumber'] = 'Primary group number';
 $LANG['group.list'] = 'Groups List';
 $LANG['group.mail'] = 'Primary Email Address';
@@ -224,7 +224,7 @@ $LANG['user.country'] = 'Country';
 $LANG['user.country.desc'] = '2 letter code from ISO 3166-1';
 $LANG['user.delete.success'] = 'User deleted successfully.';
 $LANG['user.displayname'] = 'Display name';
-$LANG['user.edit.success'] = 'User edited successfully.';
+$LANG['user.edit.success'] = 'User updated successfully.';
 $LANG['user.fax'] = 'Fax number';
 $LANG['user.fbinterval'] = 'Free-Busy interval';
 $LANG['user.fbinterval.desc'] = 'Leave blank for default (60 days)';





More information about the commits mailing list