diff options
author | William Bargent <personal@williambargent.co.uk> | 2016-07-28 14:04:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-28 14:04:04 +0100 |
commit | 29b95dd29e7eb5e00f87e9ef459755e7dfe91820 (patch) | |
tree | b87aaa6709f2ec8fda711b6338e1451441d220ac | |
parent | 5e07f9ee383a36f809a0e96218bdf1b56e7354a7 (diff) | |
parent | d705b936a9867986f124a7bf6219f86268fd7942 (diff) | |
download | nextcloud-server-29b95dd29e7eb5e00f87e9ef459755e7dfe91820.tar.gz nextcloud-server-29b95dd29e7eb5e00f87e9ef459755e7dfe91820.zip |
Merge pull request #624 from nextcloud/users-capitalization
fix capitalization of text in users management
-rw-r--r-- | settings/js/users/users.js | 6 | ||||
-rw-r--r-- | settings/templates/users/part.grouplist.php | 2 | ||||
-rw-r--r-- | settings/templates/users/part.setquota.php | 4 | ||||
-rw-r--r-- | settings/templates/users/part.userlist.php | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js index e0fdea64773..46c67fb8313 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -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); @@ -501,7 +501,7 @@ var UserList = { }; var label; if (oc_isadmin) { - label = t('settings', 'add group'); + label = t('settings', 'Add group'); } else { label = null; diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php index 64c602c364c..22a3d6e78de 100644 --- a/settings/templates/users/part.grouplist.php +++ b/settings/templates/users/part.grouplist.php @@ -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"> diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php index 18ec3fa8cd7..a0231ddace2 100644 --- a/settings/templates/users/part.setquota.php +++ b/settings/templates/users/part.setquota.php @@ -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'> @@ -25,7 +25,7 @@ </select> <?php endif; ?> <?php if((bool) !$_['isAdmin']): ?> - : + : <?php if( $_['default_quota'] === 'none'): ?> <?php p($l->t('Unlimited'));?> <?php else: ?> diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php index c7b2ad58c15..2bdd0714a3c 100644 --- a/settings/templates/users/part.userlist.php +++ b/settings/templates/users/part.userlist.php @@ -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"> </th> </tr> </thead> |