Merge pull request #33639 from nextcloud/bugfix/noid/fix-plural-usage-in-ldap

Fix plural usage in LDAP wizard

1 files changed, 20 insertions, 27 deletions

diff --git a/apps/user_ldap/lib/Wizard.php b/apps/user_ldap/lib/Wizard.php
index ae9546be08b..e85e65a7d70 100644
--- a/apps/user_ldap/lib/Wizard.php
+++ b/apps/user_ldap/lib/Wizard.php
@@ -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;
 	}