Browse Source

Relax what t accepts so we don't break it all

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
tags/v14.0.0beta1
Roeland Jago Douma 6 years ago
parent
commit
a423860f42
No account linked to committer's email address
2 changed files with 8 additions and 4 deletions
  1. 6
    2
      lib/private/L10N/L10N.php
  2. 2
    2
      lib/public/IL10N.php

+ 6
- 2
lib/private/L10N/L10N.php View File

@@ -78,13 +78,17 @@ class L10N implements IL10N {
/**
* Translating
* @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
*
* Returns the translation. If no translation is found, $text will be
* 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);
}


+ 2
- 2
lib/public/IL10N.php View File

@@ -45,14 +45,14 @@ interface IL10N {
/**
* Translating
* @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
*
* Returns the translation. If no translation is found, $text will be
* returned.
* @since 6.0.0
*/
public function t(string $text, array $parameters = []): string;
public function t(string $text, $parameters = []): string;

/**
* Translating

Loading…
Cancel
Save