summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-09-04 18:07:37 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-09-04 18:07:37 (GMT)
commita1cc945fbb92c835d51202ec09ef489bfb7feb35 (patch)
treefc415f0b87ebff4b2b6e270c5a0bbe54c998ece9
parentab2e2c3d6f9b29f7fa633470d7fef690655274f9 (diff)
downloadkolab-wap-a1cc945fbb92c835d51202ec09ef489bfb7feb35.tar.gz
Register missing acl rights name labels
-rw-r--r--lib/kolab_client_task.php4
-rw-r--r--lib/locale/en_US.php8
-rw-r--r--public_html/js/kolab_admin.js2
3 files changed, 5 insertions, 9 deletions
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 9160a35..1fe3761 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -903,8 +903,8 @@ class kolab_client_task
$result['default'] = $field['default'];
$this->output->add_translation('aci.new', 'aci.edit', 'aci.remove',
- 'button.ok', 'button.cancel',
- 'acl.read', 'acl.write', 'acl.append', 'acl.post', 'acl.all', 'acl.custom',
+ 'button.ok', 'button.cancel', 'acl.all', 'acl.custom',
+ 'acl.read-only', 'acl.read-write', 'acl.full', 'acl.semi-full',
'acl.l', 'acl.r', 'acl.s', 'acl.w', 'acl.i', 'acl.p', 'acl.k', 'acl.a',
'acl.x', 'acl.t', 'acl.n', 'acl.e', 'acl.d', 'acl.anyone', 'acl.anonymous',
'acl.identifier', 'acl.rights', 'acl.expire', 'acl.user',
diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index 1805d0c..be4ffef 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -56,16 +56,12 @@ $LANG['aci.thisentry'] = 'This entry';
$LANG['aci.selected'] = 'all selected';
$LANG['aci.other'] = 'all except selected';
-$LANG['acl.all'] = 'all';
-$LANG['acl.append'] = 'append';
-$LANG['acl.custom'] = 'custom...';
+$LANG['acl.all'] = 'All';
+$LANG['acl.custom'] = 'Custom...';
$LANG['acl.full'] = 'Full (without access control)';
-$LANG['acl.post'] = 'post';
-$LANG['acl.read'] = 'read';
$LANG['acl.read-only'] = 'Read-Only';
$LANG['acl.read-write'] = 'Read/Write';
$LANG['acl.semi-full'] = 'Write new items';
-$LANG['acl.write'] = 'write';
$LANG['acl.l'] = 'l - Lookup';
$LANG['acl.r'] = 'r - Read messages';
$LANG['acl.s'] = 's - Keep Seen state';
diff --git a/public_html/js/kolab_admin.js b/public_html/js/kolab_admin.js
index 5263ba4..44b62b9 100644
--- a/public_html/js/kolab_admin.js
+++ b/public_html/js/kolab_admin.js
@@ -1908,7 +1908,7 @@ function kolab_admin()
format: 'Y-m-d H:i'
});
*/
- var v = $.inArray(acl.rights, options) != -1 ? acl.rights : 'custom';
+ var v = !acl.rights ? 'read-write' : $.inArray(acl.rights, options) != -1 ? acl.rights : 'custom';
select.val(v).change();
$.each(rights, function() {
$('input[value="' + this + '"]', rights_div).prop('checked', v == 'custom' && acl.rights && acl.rights.indexOf(this) > -1);