upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #33683 from nextcloud/backport/33667/stable23

Browse source 
[stable23] Fix plural usage in LDAP wizard
This commit is contained in:
blizzz 2022-08-25 09:26:42 +02:00 committed by GitHub
commit 7e6f33df6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
apps/user_ldap/lib/Wizard.php
View file

@ -120,25 +120,11 @@ class Wizard extends LDAPUtility {
return (int)$result;
}
/**
* formats the return value of a count operation to the string to be
* inserted.
*
* @param int $count
* @return string
*/
private function formatCountResult(int $count): string {
if ($count > 1000) {
return '> 1000';
}
return (string)$count;
}
public function countGroups() {
$filter = $this->configuration->ldapGroupFilter;
if (empty($filter)) {
$output = self::$l->n('%s group found', '%s groups found', 0, [0]);
$output = self::$l->n('%n group found', '%n groups found', 0);
$this->result->addChange('ldap_group_count', $output);
return $this->result;
}
@ -152,12 +138,16 @@ class Wizard extends LDAPUtility {
}
return false;
}
$output = self::$l->n(
'%s group found',
'%s groups found',
$groupsTotal,
[$this->formatCountResult($groupsTotal)]
);
if ($groupsTotal > 1000) {
$output = self::$l->t('> 1000 groups found');
} else {
$output = self::$l->n(
'%n group found',
'%n groups found',
$groupsTotal
);
}
$this->result->addChange('ldap_group_count', $output);
return $this->result;
}
@ -170,12 +160,15 @@ class Wizard extends LDAPUtility {
$filter = $this->access->getFilterForUserCount();
$usersTotal = $this->countEntries($filter, 'users');
$output = self::$l->n(
'%s user found',
'%s users found',
$usersTotal,
[$this->formatCountResult($usersTotal)]
);
if ($usersTotal > 1000) {
$output = self::$l->t('> 1000 users found');
} else {
$output = self::$l->n(
'%n user found',
'%n users found',
$usersTotal
);
}
$this->result->addChange('ldap_user_count', $output);
return $this->result;
}