From 0e4561bc0ca13849f83bc7ee9d26a865c74ca9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Jane=C4=8Dek?= Date: Wed, 26 Aug 2015 13:56:18 +0200 Subject: [PATCH 1/2] Allow negative numbers being passed to transChoice --- src/Kdyby/Translation/Translator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kdyby/Translation/Translator.php b/src/Kdyby/Translation/Translator.php index b695766d..975d25dd 100644 --- a/src/Kdyby/Translation/Translator.php +++ b/src/Kdyby/Translation/Translator.php @@ -143,7 +143,7 @@ public function translate($message, $count = NULL, $parameters = array(), $domai $parameters = $tmp; if ($count !== NULL && is_scalar($count)) { - return $this->transChoice($message, preg_replace('~[^0-9,.]~', '', $count), $parameters + array('%count%' => $count), $domain, $locale); + return $this->transChoice($message, preg_replace('~[^0-9,.\-]~', '', $count), $parameters + array('%count%' => $count), $domain, $locale); } return $this->trans($message, $parameters, $domain, $locale); From 5e1a073084c2369e2a2efebf3f844d084fa27bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Jane=C4=8Dek?= Date: Thu, 27 Aug 2015 13:53:40 +0200 Subject: [PATCH 2/2] Removed preg_replace from transChoice call to allow negative numbers --- src/Kdyby/Translation/Translator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kdyby/Translation/Translator.php b/src/Kdyby/Translation/Translator.php index 975d25dd..8c71b3ec 100644 --- a/src/Kdyby/Translation/Translator.php +++ b/src/Kdyby/Translation/Translator.php @@ -143,7 +143,7 @@ public function translate($message, $count = NULL, $parameters = array(), $domai $parameters = $tmp; if ($count !== NULL && is_scalar($count)) { - return $this->transChoice($message, preg_replace('~[^0-9,.\-]~', '', $count), $parameters + array('%count%' => $count), $domain, $locale); + return $this->transChoice($message, $count, $parameters + array('%count%' => $count), $domain, $locale); } return $this->trans($message, $parameters, $domain, $locale);