From ed3b391e4799bf1b4a4c2f990020f1069d46d3ac Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 7 Aug 2017 15:50:00 +0200 Subject: Use symfony/translation for L10N plurals Signed-off-by: Roeland Jago Douma --- lib/private/L10N/L10N.php | 7 ++++++- lib/public/L10N/IFactory.php | 9 --------- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/private/L10N/L10N.php b/lib/private/L10N/L10N.php index b933048982f..620c99dd1ec 100644 --- a/lib/private/L10N/L10N.php +++ b/lib/private/L10N/L10N.php @@ -25,6 +25,7 @@ namespace OC\L10N; use OCP\IL10N; use OCP\L10N\IFactory; use Punic\Calendar; +use Symfony\Component\Translation\PluralizationRules; class L10N implements IL10N { @@ -191,8 +192,12 @@ class L10N implements IL10N { */ public function getPluralFormFunction() { if (is_null($this->pluralFormFunction)) { - $this->pluralFormFunction = $this->factory->createPluralFunction($this->pluralFormString); + $lang = $this->getLanguageCode(); + $this->pluralFormFunction = function($n) use ($lang) { + return PluralizationRules::get($n, $lang); + }; } + return $this->pluralFormFunction; } diff --git a/lib/public/L10N/IFactory.php b/lib/public/L10N/IFactory.php index b5f93c2389c..9820082c72e 100644 --- a/lib/public/L10N/IFactory.php +++ b/lib/public/L10N/IFactory.php @@ -60,13 +60,4 @@ interface IFactory { * @since 9.0.0 */ public function languageExists($app, $lang); - - /** - * Creates a function from the plural string - * - * @param string $string - * @return string Unique function name - * @since 9.0.0 - */ - public function createPluralFunction($string); } -- cgit v1.2.3