|
@@ -80,12 +80,12 @@ discard block |
|
|
block discarded – undo |
|
80
|
80
|
// translate($message, int $count, array $params, string $lang = null) |
|
81
|
81
|
// translate($message, array $params, string $lang = null) |
|
82
|
82
|
|
|
83
|
|
- $message = (string)$message; |
|
|
83
|
+ $message = (string) $message; |
|
84
|
84
|
list($count, $params, $lang) = array_values($this->parseParameters($parameters)); |
|
85
|
85
|
|
|
86
|
86
|
// If wrong input arguments passed, return message key |
|
87
|
87
|
if (!is_int($count) || !is_array($params) || !is_string($lang)) { |
|
88
|
|
- Arrays::invoke($this->onTranslate, $this, $message, $message, $lang, (int)strval($count), (array)$params); |
|
|
88
|
+ Arrays::invoke($this->onTranslate, $this, $message, $message, $lang, (int) strval($count), (array) $params); |
|
89
|
89
|
return $message; // @ maybe throw exception? |
|
90
|
90
|
} |
|
91
|
91
|
|
|
@@ -155,8 +155,8 @@ discard block |
|
|
block discarded – undo |
|
155
|
155
|
if ($foundCount !== $translationForm) { |
|
156
|
156
|
$translationForm = str_replace('[' . $foundCount . ']', '', $translationForm); |
|
157
|
157
|
$foundCountArray = explode(',', $foundCount); |
|
158
|
|
- $from = (int)$foundCountArray[0]; |
|
159
|
|
- $to = $foundCountArray[1] === 'Inf' ? PHP_INT_MAX : (int)$foundCountArray[1]; |
|
|
158
|
+ $from = (int) $foundCountArray[0]; |
|
|
159
|
+ $to = $foundCountArray[1] === 'Inf' ? PHP_INT_MAX : (int) $foundCountArray[1]; |
|
160
|
160
|
if ($from <= $count && $count <= $to) { |
|
161
|
161
|
return $translationForm; |
|
162
|
162
|
} |