mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #624 from nextcloud/users-capitalization 

fix capitalization of text in users management
This commit is contained in:
William Bargent 2016-07-28 14:04:04 +01:00 committed by GitHub
parent 5e07f9ee38 d705b936a9
commit 29b95dd29e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings/js/users/users.js
View File

@ -91,11 +91,11 @@ var UserList = {
*/ */
// make them look like the multiselect buttons // make them look like the multiselect buttons
// until they get time to really get initialized // until they get time to really get initialized
groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'no group') + '"></select>') groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'No group') + '"></select>')
.data('username', user.name) .data('username', user.name)
.data('user-groups', user.groups); .data('user-groups', user.groups);
if ($tr.find('td.subadmins').length > 0) { if ($tr.find('td.subadmins').length > 0) {
subAdminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'no group') + '">') subAdminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'No group') + '">')
.data('username', user.name) .data('username', user.name)
.data('user-groups', user.groups) .data('user-groups', user.groups)
.data('subadmin', user.subadmin); .data('subadmin', user.subadmin);
@ -501,7 +501,7 @@ var UserList = {
}; };
var label; var label;
if (oc_isadmin) { if (oc_isadmin) {
label = t('settings', 'add group'); label = t('settings', 'Add group');
} }
else { else {
label = null; label = null;

2
settings/templates/users/part.grouplist.php
View File

@ -2,7 +2,7 @@
<!-- Add new group --> <!-- Add new group -->
<li id="newgroup-init"> <li id="newgroup-init">
<a href="#"> <a href="#">
<span><?php p($l->t('Add Group'))?></span> <span><?php p($l->t('Add group'))?></span>
</a> </a>
</li> </li>
<li id="newgroup-form" style="display: none"> <li id="newgroup-form" style="display: none">

4
settings/templates/users/part.setquota.php
View File

@ -1,6 +1,6 @@
<div class="quota"> <div class="quota">
<!-- Default storage --> <!-- Default storage -->
<span><?php p($l->t('Default Quota'));?></span> <span><?php p($l->t('Default quota'));?></span>
<?php if((bool) $_['isAdmin']): ?> <?php if((bool) $_['isAdmin']): ?>
<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s"> <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'> <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
@ -25,7 +25,7 @@
</select> </select>
<?php endif; ?> <?php endif; ?>
<?php if((bool) !$_['isAdmin']): ?> <?php if((bool) !$_['isAdmin']): ?>
: :
<?php if( $_['default_quota'] === 'none'): ?> <?php if( $_['default_quota'] === 'none'): ?>
<?php p($l->t('Unlimited'));?> <?php p($l->t('Unlimited'));?>
<?php else: ?> <?php else: ?>

10
settings/templates/users/part.userlist.php
View File

@ -5,17 +5,17 @@
<th id="headerAvatar" scope="col"></th> <th id="headerAvatar" scope="col"></th>
<?php endif; ?> <?php endif; ?>
<th id="headerName" scope="col"><?php p($l->t('Username'))?></th> <th id="headerName" scope="col"><?php p($l->t('Username'))?></th>
<th id="headerDisplayName" scope="col"><?php p($l->t( 'Full Name' )); ?></th> <th id="headerDisplayName" scope="col"><?php p($l->t( 'Full name' )); ?></th>
<th id="headerPassword" scope="col"><?php p($l->t( 'Password' )); ?></th> <th id="headerPassword" scope="col"><?php p($l->t( 'Password' )); ?></th>
<th class="mailAddress" scope="col"><?php p($l->t( 'Email' )); ?></th> <th class="mailAddress" scope="col"><?php p($l->t( 'Email' )); ?></th>
<th id="headerGroups" scope="col"><?php p($l->t( 'Groups' )); ?></th> <th id="headerGroups" scope="col"><?php p($l->t( 'Groups' )); ?></th>
<?php if(is_array($_['subadmins']) || $_['subadmins']): ?> <?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
<th id="headerSubAdmins" scope="col"><?php p($l->t('Group Admin for')); ?></th> <th id="headerSubAdmins" scope="col"><?php p($l->t('Group admin for')); ?></th>
<?php endif;?> <?php endif;?>
<th id="headerQuota" scope="col"><?php p($l->t('Quota')); ?></th> <th id="headerQuota" scope="col"><?php p($l->t('Quota')); ?></th>
<th class="storageLocation" scope="col"><?php p($l->t('Storage Location')); ?></th> <th class="storageLocation" scope="col"><?php p($l->t('Storage location')); ?></th>
<th class="userBackend" scope="col"><?php p($l->t('User Backend')); ?></th> <th class="userBackend" scope="col"><?php p($l->t('User backend')); ?></th>
<th class="lastLogin" scope="col"><?php p($l->t('Last Login')); ?></th> <th class="lastLogin" scope="col"><?php p($l->t('Last login')); ?></th>
<th id="headerRemove">&nbsp;</th> <th id="headerRemove">&nbsp;</th>
</tr> </tr>
</thead> </thead>