Merge pull request #32160 from nextcloud/backport/32155/stable23

[stable23] Fx translations with trailing colon

Author: szaimen

lib/private/L10N/L10NString.php

@@ -74,10 +74,16 @@ public function __toString(): string {
 			return 'Can not use pipe character in translations';
 		}
 
+		$beforeIdentity = $identity;
 		$identity = str_replace('%n', '%count%', $identity);
 
+		$parameters = [];
+		if ($beforeIdentity !== $identity) {
+			$parameters = ['%count%' => $this->count];
+		}
+
 		// $count as %count% as per \Symfony\Contracts\Translation\TranslatorInterface
-		$text = $identityTranslator->trans($identity, ['%count%' => $this->count]);
+		$text = $identityTranslator->trans($identity, $parameters);
 
 		return vsprintf($text, $this->parameters);
 	}

tests/lib/L10N/L10nTest.php

@@ -35,6 +35,13 @@ protected function getFactory() {
 		return new Factory($config, $request, $userSession, \OC::$SERVERROOT);
 	}
 
+	public function testSimpleTranslationWithTrailingColon(): void {
+		$transFile = \OC::$SERVERROOT.'/tests/data/l10n/de.json';
+		$l = new L10N($this->getFactory(), 'test', 'de', 'de_AT', [$transFile]);
+
+		$this->assertEquals('Files:', $l->t('Files:'));
+	}
+
 	public function testGermanPluralTranslations() {
 		$transFile = \OC::$SERVERROOT.'/tests/data/l10n/de.json';
 		$l = new L10N($this->getFactory(), 'test', 'de', 'de_AT', [$transFile]);