cs fixes, updated contributors in readme

Author: oscarotero

README.md

@@ -264,3 +264,5 @@ Note, if the second argument is not defined, the default is `self::MERGE_ADD | s
 * [leom](https://github.com/leom) (Jed fixes)
 * [eusonlito](https://github.com/eusonlito) (Blade extractor)
 * [vvh-empora](https://github.com/vvh-empora) (fixes)
+* [mlocati](https://github.com/mlocati) (Mo generator/extractor)
+* [and many more...](https://github.com/oscarotero/Gettext/graphs/contributors)

src/Extractors/Mo.php

@@ -50,6 +50,7 @@ public static function fromString($string, Translations $translations = null, $f
             $original = $stream->read($table_originals[$i * 2 + 1]);
             $stream->seekto($table_translations[$i * 2 + 2]);
             $translated = $stream->read($table_translations[$i * 2 + 1]);
+
             if ($original === '') {
                 // Headers
                 foreach (explode("\n", $translated) as $headerLine) {
@@ -60,20 +61,25 @@ public static function fromString($string, Translations $translations = null, $f
                 }
             } else {
                 $chunks = explode("\x04", $original, 2);
+
                 if (isset($chunks[1])) {
                     $context = $chunks[0];
                     $original = $chunks[1];
                 } else {
                     $context = '';
                 }
+
                 $chunks = explode("\x00", $original, 2);
+
                 if (isset($chunks[1])) {
                     $original = $chunks[0];
                     $plural = $chunks[1];
                 } else {
                     $plural = '';
                 }
+
                 $translation = $translations->insert($context, $original, $plural);
+
                 if ($translated !== '') {
                     if ($plural === '') {
                         $translation->setTranslation($translated);

src/Generators/Mo.php

@@ -12,86 +12,112 @@ public static function toString(Translations $translations)
     {
         $array = array();
         $headers = '';
+
         foreach ($translations->getHeaders() as $headerName => $headerValue) {
             $headers .= "$headerName: $headerValue\n";
         }
+
         if (strlen($headers)) {
             $array[''] = $headers;
         }
+
         foreach ($translations as $translation) {
             if ($translation->hasContext()) {
                 $originalString = $translation->getContext()."\x04".$translation->getOriginal();
             } else {
                 $originalString = $translation->getOriginal();
             }
+
             if ($translation->hasPlural()) {
                 $originalString .= "\x00".$translation->getPlural();
             }
+
             $array[$originalString] = $translation;
         }
+
         ksort($array);
         $numEntries = count($array);
         $originalsTable = '';
         $translationsTable = '';
         $originalsIndex = array();
         $translationsIndex = array();
+
         foreach ($array as $originalString => $translation) {
             if (is_string($translation)) {
                 // Headers
                 $translationString = $translation;
             } else {
                 /* @var $translation \Gettext\Translation */
                 $translationString = $translation->getTranslation();
+
                 if ($translation->hasPluralTranslation()) {
                     $translationString .= "\x00".implode("\x00", $translation->getPluralTranslation());
                 }
             }
+
             $originalsIndex[] = array('relativeOffset' => strlen($originalsTable), 'length' => strlen($originalString));
             $originalsTable .= $originalString."\x00";
             $translationsIndex[] = array('relativeOffset' => strlen($translationsTable), 'length' => strlen($translationString));
             $translationsTable .= $translationString."\x00";
         }
+
         // Offset of table with the original strings index: right after the header (which is 7 words)
         $originalsIndexOffset = 7 * 4;
+
         // Size of table with the original strings index
         $originalsIndexSize = $numEntries * (4 + 4);
+
         // Offset of table with the translation strings index: right after the original strings index table
         $translationsIndexOffset = $originalsIndexOffset + $originalsIndexSize;
+
         // Size of table with the translation strings index
         $translationsIndexSize = $numEntries * (4 + 4);
+
         // Hashing table starts after the header and after the index table
         $originalsStringsOffset = $translationsIndexOffset + $translationsIndexSize;
+
         // Translations start after the keys
         $translationsStringsOffset = $originalsStringsOffset + strlen($originalsTable);
 
         // Let's generate the .mo file binary data
         $mo = '';
+
         // Magic number
         $mo .= pack('L', 0x950412de);
+
         // File format revision
         $mo .= pack('L', 0);
+
         // Number of strings
         $mo .= pack('L', $numEntries);
+
         // Offset of table with original strings
         $mo .= pack('L', $originalsIndexOffset);
+
         // Offset of table with translation strings
         $mo .= pack('L', $translationsIndexOffset);
+
         // Size of hashing table: we don't use it.
         $mo .= pack('L', 0);
+
         // Offset of hashing table: it would start right after the translations index table
         $mo .= pack('L', $translationsIndexOffset + $translationsIndexSize);
+
         // Write the lengths & offsets of the original strings
         foreach ($originalsIndex as $info) {
             $mo .= pack('L', $info['length']);
             $mo .= pack('L', $originalsStringsOffset + $info['relativeOffset']);
         }
+
         // Write the lengths & offsets of the translated strings
         foreach ($translationsIndex as $info) {
             $mo .= pack('L', $info['length']);
             $mo .= pack('L', $translationsStringsOffset + $info['relativeOffset']);
         }
+
         // Write original strings
         $mo .= $originalsTable;
+
         // Write translation strings
         $mo .= $translationsTable;
 

src/Translator.php

@@ -12,10 +12,9 @@ class Translator
     private $context_glue = "\004";
     private $plurals = array();
 
-
     /**
      * Set a translation instance as global, to use it with the gettext functions
-     * 
+     *
      * @param Translator $translator
      */
     public static function initGettextFunctions(Translator $translator)
@@ -25,7 +24,6 @@ public static function initGettextFunctions(Translator $translator)
         include_once __DIR__.'/translator_functions.php';
     }
 
-
     /**
      * Loads translation from a Translations instance, a file on an array
      *
@@ -50,11 +48,10 @@ public function loadTranslations($translations)
         return $this;
     }
 
-
     /**
      * Set new translations to the dictionary
      *
-     * @param array       $translations
+     * @param array $translations
      */
     public function addTranslations(array $translations)
     {

tests/PoExtractorTest.php

@@ -9,7 +9,7 @@ public function testParser()
         $translations = Gettext\Extractors\Po::fromFile(__DIR__.'/files/po.po');
 
         $this->assertInstanceOf('Gettext\\Translation', $translations->find(null, '%ss must be unique for %ss %ss.'));
-        
+
         $this->assertEquals($translations->find(null, 'and')->getFlags(), array('c-format'));
         $this->assertEquals($translations->find(null, 'Value %sr is not a valid choice.')->getExtractedComments(), array('This is a extracted comment'));
     }
@@ -59,14 +59,14 @@ public function testReferences()
         $this->assertEquals(
             $translations->find(null, 'This field cannot be null.')->getReferences(),
             array(
-                array('C:/Users/Me/Documents/foo2.php', '1')
+                array('C:/Users/Me/Documents/foo2.php', '1'),
             )
         );
 
         $this->assertEquals(
             $translations->find(null, 'This field cannot be blank.')->getReferences(),
             array(
-                array('C:/Users/Me/Documents/foo1.php', null)
+                array('C:/Users/Me/Documents/foo1.php', null),
             )
         );
 
@@ -82,7 +82,7 @@ public function testReferences()
     public function testMultilineTranslation()
     {
         $translations = Gettext\Extractors\Po::fromFile(__DIR__.'/files/po.po');
-        
+
         $t1 = $translations->find(null, '{test1}');
         $this->assertInstanceOf('Gettext\\Translation', $t1);
 

tests/TranslationsTest.php

@@ -108,7 +108,7 @@ public function testMergeReferences()
 
         $this->assertTrue($translation2->hasReferences());
         $this->assertCount(1, $actualRef = $translation2->getReferences());
-        $expectedRef2 = array($comment, $line); 
+        $expectedRef2 = array($comment, $line);
         $this->assertEquals($expectedRef2, current($actualRef));
 
         //merge with references

tests/TranslatorTest.php

@@ -13,7 +13,7 @@ public function testOne()
         $this->assertEquals('Cijeo broj', $t->gettext('Integer'));
         $this->assertEquals('Ovo polje ne može biti prazno.', $t->gettext('This field cannot be blank.'));
         $this->assertEquals('Value %sr is not a valid choice.', $t->gettext('Value %sr is not a valid choice.'));
-        
+
         //domains
         $this->assertEquals('single', $t->gettext('single'));
         $this->assertEquals('test', $t->dgettext('messages', 'single'));
@@ -26,7 +26,7 @@ public function testFunctions()
         $t->loadTranslations(Gettext\Translations::fromPoFile(__DIR__.'/files/po.po'));
 
         Gettext\Translator::initGettextFunctions($t);
-        
+
         $this->assertEquals('Cijeo broj', __('Integer'));
         $this->assertEquals('Ovo polje ne može biti prazno.', __('This field cannot be blank.'));
         $this->assertEquals('Value %sr is not a valid choice.', __('Value %sr is not a valid choice.'));