Correctly handle when mo file contains less plurals than formula says

Fixes #18 Signed-off-by: Michal Čihař <[email protected]>
phpmyadmin · May 23, 2017 · 690e70b · 690e70b
1 parent 5c0405e
commit 690e70b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Translator.php b/src/Translator.php
@@ -301,6 +301,9 @@ public function ngettext($msgid, $msgidPlural, $number)
         $result = $this->cache_translations[$key];
         $list = explode(chr(0), $result);
 
+        if (! isset($list[$select])) {
+            return $list[0];
+        }
         return $list[$select];
     }
 

diff --git a/tests/MoFilesTest.php b/tests/MoFilesTest.php
@@ -34,11 +34,11 @@ public function testMoFilePlurals($filename)
     {
         $parser = new PhpMyAdmin\MoTranslator\Translator($filename);
         $expected_2 = '%d sekundy';
-        if (strpos($filename, 'plurals.mo') !== false || strpos($filename, 'noheader.mo') !== false) {
-            $expected_0 = '%d sekundy';
-        } elseif (strpos($filename, 'invalid-formula.mo') !== false) {
+        if (strpos($filename, 'invalid-formula.mo') !== false || strpos($filename, 'lessplurals.mo') !== false) {
             $expected_0 = '%d sekunda';
             $expected_2 = '%d sekunda';
+        } elseif (strpos($filename, 'plurals.mo') !== false || strpos($filename, 'noheader.mo') !== false) {
+            $expected_0 = '%d sekundy';
         } else {
             $expected_0 = '%d sekund';
         }

diff --git a/tests/data/lessplurals.mo b/tests/data/lessplurals.mo