Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix capitalization of text in users management #624

Merged
merged 1 commit into from
Jul 28, 2016
Merged

fix capitalization of text in users management #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions settings/js/users/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ var UserList = {
*/
// make them look like the multiselect buttons
// 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('user-groups', user.groups);
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('user-groups', user.groups)
.data('subadmin', user.subadmin);
Expand Down Expand Up @@ -501,7 +501,7 @@ var UserList = {
};
var label;
if (oc_isadmin) {
label = t('settings', 'add group');
label = t('settings', 'Add group');
}
else {
label = null;
Expand Down
2 changes: 1 addition & 1 deletion settings/templates/users/part.grouplist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Add new group -->
<li id="newgroup-init">
<a href="#">
<span><?php p($l->t('Add Group'))?></span>
<span><?php p($l->t('Add group'))?></span>
</a>
</li>
<li id="newgroup-form" style="display: none">
Expand Down
4 changes: 2 additions & 2 deletions settings/templates/users/part.setquota.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="quota">
<!-- Default storage -->
<span><?php p($l->t('Default Quota'));?></span>
<span><?php p($l->t('Default quota'));?></span>
<?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">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
Expand All @@ -25,7 +25,7 @@
</select>
<?php endif; ?>
<?php if((bool) !$_['isAdmin']): ?>
:
:
<?php if( $_['default_quota'] === 'none'): ?>
<?php p($l->t('Unlimited'));?>
<?php else: ?>
Expand Down
10 changes: 5 additions & 5 deletions settings/templates/users/part.userlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<th id="headerAvatar" scope="col"></th>
<?php endif; ?>
<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 class="mailAddress" scope="col"><?php p($l->t( 'Email' )); ?></th>
<th id="headerGroups" scope="col"><?php p($l->t( 'Groups' )); ?></th>
<?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;?>
<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="userBackend" scope="col"><?php p($l->t('User Backend')); ?></th>
<th class="lastLogin" scope="col"><?php p($l->t('Last Login')); ?></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="lastLogin" scope="col"><?php p($l->t('Last login')); ?></th>
<th id="headerRemove">&nbsp;</th>
</tr>
</thead>
Expand Down