Changeset 41722 for trunk/src/wp-includes/pomo/translations.php

Timestamp:

10/04/2017 01:29:59 AM (7 years ago)

Author:

pento

Message:

I18N: Introduce the Plural_Forms class.

Historically, we've evaluated the plural forms for each language using create_function(). This is being deprecated in PHP 7.2, so needs to be replaced.

The Plural_Forms class parses the Plural-Forms header from the PO file, and internally caches the result of all subsequent plural form tests, allowing it to match the performance of the existing code.

Props rmccue.
Fixes #41562.

File:

• trunk/src/wp-includes/pomo/translations.php (modified) (3 diffs)

trunk/src/wp-includes/pomo/translations.php

@@ -8 +8 @@
  */
 
+require_once dirname(__FILE__) . '/plural-forms.php';
 require_once dirname(__FILE__) . '/entry.php';
 
@@ -188 +189 @@
         if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
             $nplurals = (int)$matches[1];
-            $expression = trim($this->parenthesize_plural_exression($matches[2]));
+            $expression = trim( $matches[2] );
             return array($nplurals, $expression);
         } else {
@@ -202 +203 @@
      */
     function make_plural_form_function($nplurals, $expression) {
-        $expression = str_replace('n', '$n', $expression);
-        $func_body = "
-            \$index = (int)($expression);
-            return (\$index < $nplurals)? \$index : $nplurals - 1;";
-        return create_function('$n', $func_body);
+        try {
+            $handler = new Plural_Forms( rtrim( $expression, ';' ) );
+            return array( $handler, 'get' );
+        } catch ( Exception $e ) {
+            // Fall back to default plural-form function.
+            return $this->make_plural_form_function( 2, 'n != 1' );
+        }
     }