[zen-18] refactor TextDomain and update documentation

zendframework · Jun 24, 2012 · dc708db · dc708db
1 parent 34adb69
commit dc708db
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.php
@@ -146,7 +146,7 @@ public function load($filename, $locale)
                 list($header, $content) = explode(':', $rawHeader, 1);
 
                 if (trim(strtolower($header)) === 'plural-forms') {
-                    $textDomain->setPluralRule(
+                    $textDomain->pluralRule(
                         PluralRule::fromString($content)
                     );
                 }

diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.php
@@ -64,7 +64,7 @@ public function load($filename, $locale)
 
         if (array_key_exists('', $textDomain)) {
             if (isset($textDomain['']['plural_forms'])) {
-                $textDomain->setPluralRule(
+                $textDomain->pluralRule(
                     PluralRule::fromString($textDomain['']['plural_forms'])
                 );
             }

diff --git a/src/Translator/TextDomain.php b/src/Translator/TextDomain.php
@@ -43,28 +43,19 @@ class TextDomain extends ArrayObject
     protected $pluralRule;
 
     /**
-     * Get the plural rule.
+     * Get or set the plural rule.
      *
+     * @param  PluralRule $rule
      * @return PluralRule
      */
-    public function getPluralRule()
+    public function pluralRule(PluralRule $rule = null)
     {
-        if ($this->pluralRule === null) {
+        if ($rule !== null) {
+            $this->pluralRule = $rule;
+        } elseif ($this->pluralRule === null) {
             $this->pluralRule = PluralRule::fromString('nplurals=2; plural=n==1');
         }
 
         return $this->pluralRule;
     }
-
-    /**
-     * Set the plural rule.
-     *
-     * @param  PluralRule $rule
-     * @return TextDomain
-     */
-    public function setPluralRule(PluralRule $rule)
-    {
-        $this->pluralRule = $rule;
-        return $this;
-    }
 }
diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -232,7 +232,7 @@ public function translatePlural(
             return ($number != 1 ? $singular : $plural);
         }
 
-        $index = $this->messages[$textDomain][$locale]['']->evaluate($number);
+        $index = $this->messages[$textDomain][$locale]->pluralRule()->evaluate($number);
 
         if (!isset($translation[$index])) {
             throw new Exception\OutOfBoundsException(sprintf(