Merge pull request #48028 from nextcloud/fix/fix-ldap-setupcheck-crash

fix(user_ldap): Use %n in plural translation to avoid a crash in L10N
This commit is contained in:
Andy Scherzinger 2024-09-16 08:32:24 +02:00 committed by GitHub
commit a6bd34e0bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -58,7 +58,7 @@ class LdapConnection implements ISetupCheck {
if (!empty($bindFailedConfigurations)) {
$output .= $this->l10n->n(
'Binding failed for this LDAP configuration: %s',
'Binding failed for these LDAP configurations: %s',
'Binding failed for %n LDAP configurations: %s',
count($bindFailedConfigurations),
[implode(',', $bindFailedConfigurations)]
)."\n";
@ -66,7 +66,7 @@ class LdapConnection implements ISetupCheck {
if (!empty($searchFailedConfigurations)) {
$output .= $this->l10n->n(
'Searching failed for this LDAP configuration: %s',
'Searching failed for these LDAP configurations: %s',
'Searching failed for %n LDAP configurations: %s',
count($searchFailedConfigurations),
[implode(',', $searchFailedConfigurations)]
)."\n";
@ -74,7 +74,7 @@ class LdapConnection implements ISetupCheck {
if (!empty($inactiveConfigurations)) {
$output .= $this->l10n->n(
'There is an inactive LDAP configuration: %s',
'There are inactive LDAP configurations: %s',
'There are %n inactive LDAP configurations: %s',
count($inactiveConfigurations),
[implode(',', $inactiveConfigurations)]
)."\n";
@ -86,7 +86,7 @@ class LdapConnection implements ISetupCheck {
}
return SetupResult::success($this->l10n->n(
'Binding and searching works on the configured LDAP connection (%s)',
'Binding and searching works on all of the configured LDAP connections (%s)',
'Binding and searching works on all of the %n configured LDAP connections (%s)',
count($availableConfigs),
[implode(',', $availableConfigs)]
));