Merge branch 'edge' into latest

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 19a86a00e..07d48ec08 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -87,10 +87,10 @@ class Minz_Translate {
 	 * preferred languages then returns the default language
 	 * @param string|null $user the connected user language (nullable)
 	 * @param array<string> $preferred an array of the preferred languages
-	 * @param string $default the preferred language to use
+	 * @param string|null $default the preferred language to use
 	 * @return string containing the language to use
 	 */
-	public static function getLanguage($user, $preferred, $default) {
+	public static function getLanguage(?string $user, array $preferred, ?string $default): string {
 		if (null !== $user) {
 			return $user;
 		}
@@ -232,7 +232,7 @@ class Minz_Translate {
 		}
 
 		// Get the facultative arguments to replace i18n variables.
-		return vsprintf($translation_value, $args);
+		return empty($args) ? $translation_value : vsprintf($translation_value, $args);
 	}
 
 	/**