Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-02-22 14:37:29 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-02-22 14:37:29 +0300
commita423860f42a4466e7beb71efea4f132320525716 (patch)
treeb33f252db0f7589111a4e8e0d54fc2e4a399edfe
parentc2c2c06546801d956778f5ab87e9042d45b40dc4 (diff)
Relax what t accepts so we don't break it all
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--lib/private/L10N/L10N.php8
-rw-r--r--lib/public/IL10N.php4
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php
index f0e37ca1a5d..a9b1b7377aa 100644
--- a/lib/private/L10N/L10N.php
+++ b/lib/private/L10N/L10N.php
@@ -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);
}
diff --git a/lib/public/IL10N.php b/lib/public/IL10N.php
index 158e0cb156c..2e55c151f62 100644
--- a/lib/public/IL10N.php
+++ b/lib/public/IL10N.php
@@ -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