summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2012-12-20 13:59:46 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2012-12-20 13:59:46 +0100
commit386044b7e4c6c952c93d191725898dfc19b610ae (patch)
tree2fdc18a870b1de72e2cf9954c279c5ceb2990c53 /settings/js
parent9cd3e3b9e98d8943627c7a3b92d509f37d2143c8 (diff)
downloadnextcloud-server-386044b7e4c6c952c93d191725898dfc19b610ae.tar.gz
nextcloud-server-386044b7e4c6c952c93d191725898dfc19b610ae.zip
backport #970 to stable45
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/users.js20
1 files changed, 13 insertions, 7 deletions
diff --git a/settings/js/users.js b/settings/js/users.js
index 7ed8859cb73..473b8dba086 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -26,7 +26,7 @@ var UserList={
UserList.deleteCanceled = false;
// Provide user with option to undo
- $('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
+ $('#notification').html(t('settings', 'deleted')+' '+uid+'<span class="undo">'+t('settings', 'undo')+'</span>');
$('#notification').data('deleteuser',true);
$('#notification').fadeIn();
},
@@ -71,10 +71,10 @@ var UserList={
var tr = $('tbody tr').first().clone();
tr.attr('data-uid', username);
tr.find('td.name').text(username);
- var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups"></select>').attr('data-username', username).attr('data-user-groups', groups);
+ var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
tr.find('td.groups').empty();
if (tr.find('td.subadmins').length > 0) {
- var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
+ var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
tr.find('td.subadmins').empty();
}
var allGroups = String($('#content table').attr('data-groups')).split(', ');
@@ -187,7 +187,7 @@ var UserList={
};
var label;
if(isadmin){
- label = t('core', 'add group');
+ label = t('settings', 'add group');
}else{
label = null;
}
@@ -363,15 +363,21 @@ $(document).ready(function(){
var username=$('#newusername').val();
var password=$('#newuserpassword').val();
if($('#content table tbody tr').filterAttr('data-uid',username).length>0){
- OC.dialogs.alert('The username is already being used', 'Error creating user');
+ OC.dialogs.alert(
+ t('settings', 'The username is already being used'),
+ t('settings', 'Error creating user'));
return;
}
if($.trim(username) == '') {
- OC.dialogs.alert('A valid username must be provided', 'Error creating user');
+ OC.dialogs.alert(
+ t('settings', 'A valid username must be provided'),
+ t('settings', 'Error creating user'));
return false;
}
if($.trim(password) == '') {
- OC.dialogs.alert('A valid password must be provided', 'Error creating user');
+ OC.dialogs.alert(
+ t('settings', 'A valid password must be provided'),
+ t('settings', 'Error creating user'));
return false;
}
var groups=$('#newusergroups').prev().children('div').data('settings').checked;