Fixed handling of corrupted formulas in mo files

Fixes #17 Signed-off-by: Michal Čihař <[email protected]>
phpmyadmin · May 23, 2017 · 83b74d8 · 83b74d8
1 parent b801c2e
commit 83b74d8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/Translator.php b/src/Translator.php
@@ -263,9 +263,13 @@ private function selectString($n)
         if (is_null($this->pluralexpression)) {
             $this->pluralexpression = new ExpressionLanguage();
         }
-        $plural = $this->pluralexpression->evaluate(
-            $this->getPluralForms(), array('n' => $n)
-        );
+        try {
+            $plural = $this->pluralexpression->evaluate(
+                $this->getPluralForms(), array('n' => $n)
+            );
+        } catch (\Exception $e) {
+            $plural = 0;
+        }
 
         if ($plural >= $this->pluralcount) {
             $plural = $this->pluralcount - 1;

diff --git a/tests/MoFilesTest.php b/tests/MoFilesTest.php
@@ -33,13 +33,17 @@ public function testMoFileTranslate($filename)
     public function testMoFilePlurals($filename)
     {
         $parser = new PhpMyAdmin\MoTranslator\Translator($filename);
+        $expected_2 = '%d sekundy';
         if (strpos($filename, 'plurals.mo') !== false) {
-            $expected = '%d sekundy';
+            $expected_0 = '%d sekundy';
+        } elseif (strpos($filename, 'invalid-formula.mo') !== false) {
+            $expected_0 = '%d sekunda';
+            $expected_2 = '%d sekunda';
         } else {
-            $expected = '%d sekund';
+            $expected_0 = '%d sekund';
         }
         $this->assertEquals(
-            $expected,
+            $expected_0,
             $parser->ngettext(
                 '%d second',
                 '%d seconds',
@@ -55,23 +59,23 @@ public function testMoFilePlurals($filename)
             )
         );
         $this->assertEquals(
-            '%d sekundy',
+            $expected_2,
             $parser->ngettext(
                 '%d second',
                 '%d seconds',
                 2
             )
         );
         $this->assertEquals(
-            $expected,
+            $expected_0,
             $parser->ngettext(
                 '%d second',
                 '%d seconds',
                 5
             )
         );
         $this->assertEquals(
-            $expected,
+            $expected_0,
             $parser->ngettext(
                 '%d second',
                 '%d seconds',

diff --git a/tests/data/invalid-formula.mo b/tests/data/invalid-formula.mo
diff --git a/tests/data/not-translated/invalid-equation.mo b/tests/data/not-translated/invalid-equation.mo