From 4971db37d48ed184f8f66a3b2ed3cf89235a660b Mon Sep 17 00:00:00 2001 From: Andy Staudacher Date: Wed, 18 Mar 2009 02:40:16 +0000 Subject: Fix for ticket 142: Choose plural form "other" for count == 0 (unless the locale has a specific plural form for zero) --- core/libraries/I18n.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'core/libraries') diff --git a/core/libraries/I18n.php b/core/libraries/I18n.php index 7bb2eff6..7c1bafd9 100644 --- a/core/libraries/I18n.php +++ b/core/libraries/I18n.php @@ -93,7 +93,7 @@ class I18n_Core { */ public function translate($message, $options=array()) { $locale = empty($options['locale']) ? $this->_config['default_locale'] : $options['locale']; - $count = empty($options['count']) ? null : $options['count']; + $count = isset($options['count']) ? $options['count'] : null; $values = $options; unset($values['locale']); $this->log($message, $options); @@ -188,8 +188,6 @@ class I18n_Core { private function pluralize($locale, $entry, $count) { if (!is_array($entry)) { return $entry; - } else if ($count == null) { - $count = $locale == "en" ? 0 : 1; } $plural_key = self::get_plural_key($locale, $count); -- cgit v1.2.3