adapted solution for 5xx error on i10n vsprintf

jan · jan · commit 8d7670ee4a41 · 2020-11-16T11:13:06.000+01:00
diff --git a/changelog/unreleased/38103 b/changelog/unreleased/38103
@@ -0,0 +1,8 @@
+Bugfix: Prevent server error when loading invalid/corrupt translations
+
+This fix prevents server errors when loading invalid or corrupt translations
+from Transifex. This is critical as every user is able to contribute to
+the ownCloud translations.
+
+https://github.com/owncloud/core/issues/37799
+https://github.com/owncloud/core/pull/38103
diff --git a/lib/private/legacy/l10n/string.php b/lib/private/legacy/l10n/string.php
@@ -66,7 +66,10 @@ public function __toString() {
 
 		// Replace %n first (won't interfere with vsprintf)
 		$text = \str_replace('%n', $this->count, $text);
-		return \vsprintf($text, $this->parameters);
+		$text = @\vsprintf($text, $this->parameters);
+
+		// If vsprintf fails, return untranslated string
+		return $text === false ? $this->text : $text;
 	}
 
 	public function jsonSerialize() {
diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php
@@ -46,6 +46,14 @@ public function testGermanPluralTranslations() {
 		$this->assertEquals('2 Dateien', (string) $l->n('%n file', '%n files', 2));
 	}
 
+	public function testMalformedTranslations() {
+		$lMock = $this->createMock('OC\L10N\L10N');
+		$lMock->method('getTranslations')->willReturn(['malformed' => 'malformed %']);
+
+		$lString = new \OC_L10N_String($lMock, "malformed", []);
+		self::assertEquals('malformed', $lString->__toString());
+	}
+
 	public function testRussianPluralTranslations() {
 		$transFile = \OC::$SERVERROOT.'/tests/data/l10n/ru.json';
 		$l = new L10N($this->getFactory(), 'test', 'ru', [$transFile]);
