Ticket #4005: gettext.php.2.diff

gettext.php

@@ -282 +282 @@
         $header = $this->cache_translations[""];
       } else {
         $header = $this->get_translation_string(0);
-      }
+      }
+      $header .= "\n"; // make sure our regex matches
       if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
         $expr = $regs[1];
       else
         $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-      $this->pluralheader = $expr;
+
+      // sanitize
+      if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/', $expr, $matches)) {
+        $nplurals= preg_replace( '@[^0-9]@', '', $matches[1] );
+        $plural= preg_replace( '@[^n0-9:\(\)\?\|\&=!<>+*/\%-]@', '', $matches[2] );
+        $expr= 'nplurals='.$nplurals.';plural='.$plural;
+      }
+      else {
+        // malformed expression, use default ($expr is not overwritten)
+      }
+      
+      // add parentheses
+      // important since PHP's ternary evaluates from left to right
+      $expr.= ';';
+      $res= '';
+      $p= 0;
+      for ($i= 0; $i < strlen($expr); $i++) {
+        $ch= $expr[$i];
+        switch ($ch) {
+          case '?':
+            $res.= ' ? (';
+            $p++;
+            break;
+          case ':':
+            $res.= ') : (';
+            break;
+          case ';':
+            $res.= str_repeat( ')', $p) . ';';
+            $p= 0;
+            break;
+          default:
+            $res.= $ch;
+        }
+      }
+
+      $this->pluralheader = $res;
     }
     return $this->pluralheader;
   }