Merge pull request #58573 from nextcloud/backport/58571/stable31

[stable31] fix(L10N): stop stripping _ from language codes

Author: salmart-dev

lib/private/L10N/Factory.php

@@ -146,7 +146,7 @@ private function cleanLanguage(?string $lang): ?string {
 		if ($lang === null) {
 			return null;
 		}
-		$lang = preg_replace('/[^a-zA-Z0-9.;,=-]/', '', $lang);
+		$lang = preg_replace('/[^a-zA-Z0-9.;,=_-]/', '', $lang);
 		return str_replace('..', '', $lang);
 	}
 

tests/lib/L10N/FactoryTest.php

@@ -94,6 +94,7 @@ public static function dataCleanLanguage(): array {
 		return [
 			'null shortcut' => [null, null],
 			'default language' => ['de', 'de'],
+			'regional language' => ['de_DE', 'de_DE'],
 			'malicious language' => ['de/../fr', 'defr'],
 			'request language' => ['kab;q=0.8,ka;q=0.7,de;q=0.6', 'kab;q=0.8,ka;q=0.7,de;q=0.6'],
 		];