Merge pull request #8497 from nextcloud/relax_l10n
Relax what t accepts so we don't break it all
This commit is contained in:
commit
7144d7a1e3
|
@ -78,13 +78,17 @@ class L10N implements IL10N {
|
||||||
/**
|
/**
|
||||||
* Translating
|
* Translating
|
||||||
* @param string $text The text we need a translation for
|
* @param string $text The text we need a translation for
|
||||||
* @param array $parameters default:array() Parameters for sprintf
|
* @param array|string $parameters default:array() Parameters for sprintf
|
||||||
* @return string Translation or the same text
|
* @return string Translation or the same text
|
||||||
*
|
*
|
||||||
* Returns the translation. If no translation is found, $text will be
|
* Returns the translation. If no translation is found, $text will be
|
||||||
* returned.
|
* returned.
|
||||||
*/
|
*/
|
||||||
public function t(string $text, array $parameters = []): string {
|
public function t(string $text, $parameters = []): string {
|
||||||
|
if (!\is_array($parameters)) {
|
||||||
|
$parameters = [$parameters];
|
||||||
|
}
|
||||||
|
|
||||||
return (string) new L10NString($this, $text, $parameters);
|
return (string) new L10NString($this, $text, $parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,14 +45,14 @@ interface IL10N {
|
||||||
/**
|
/**
|
||||||
* Translating
|
* Translating
|
||||||
* @param string $text The text we need a translation for
|
* @param string $text The text we need a translation for
|
||||||
* @param array $parameters default:array() Parameters for sprintf
|
* @param array|string $parameters default:array() Parameters for sprintf
|
||||||
* @return string Translation or the same text
|
* @return string Translation or the same text
|
||||||
*
|
*
|
||||||
* Returns the translation. If no translation is found, $text will be
|
* Returns the translation. If no translation is found, $text will be
|
||||||
* returned.
|
* returned.
|
||||||
* @since 6.0.0
|
* @since 6.0.0
|
||||||
*/
|
*/
|
||||||
public function t(string $text, array $parameters = []): string;
|
public function t(string $text, $parameters = []): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Translating
|
* Translating
|
||||||
|
|
Loading…
Reference in New Issue