changed Jed extractor to be compatible with Jed generator #90

Author: oscarotero

src/Extractors/Jed.php

@@ -22,4 +22,26 @@ public static function fromString($string, Translations $translations = null, $f
 
         return PhpArray::handleArray($content, $translations);
     }
+
+    /**
+     * Extract and insert a new translation
+     * 
+     * @param Translations $translations
+     * @param string $key
+     * @param string $message
+     */
+    protected static function insertTranslation(Translations $translations, $key, $message)
+    {
+        $context_glue = '\u0004';
+        $key = explode($context_glue, $key);
+
+        $context = isset($key[1]) ? array_shift($key) : '';
+        $original = array_shift($key);
+        $translation = array_shift($message);
+        $plural_translation = array_shift($message);
+
+        $entry = $translations->insert($context, $original);
+        $entry->setTranslation($translation);
+        $entry->setPluralTranslation($plural_translation);
+    }
 }

src/Extractors/PhpArray.php

@@ -56,20 +56,31 @@ public static function handleArray(array $content, Translations $translations)
             $translations->setDomain($translations_info['domain']);
         }
 
-        $context_glue = '\u0004';
-
         foreach ($content as $key => $message) {
-            $key = explode($context_glue, $key);
+            static::insertTranslation($translations, $key, $message);
+        }
+    }
 
-            $context = isset($key[1]) ? array_shift($key) : '';
-            $original = array_shift($key);
-            $plural = array_shift($message);
-            $translation = array_shift($message);
-            $plural_translation = array_shift($message);
+    /**
+     * Extract and insert a new translation
+     * 
+     * @param Translations $translations
+     * @param string $key
+     * @param string $message
+     */
+    protected static function insertTranslation(Translations $translations, $key, $message)
+    {
+        $context_glue = '\u0004';
+        $key = explode($context_glue, $key);
 
-            $entry = $translations->insert($context, $original, $plural);
-            $entry->setTranslation($translation);
-            $entry->setPluralTranslation($plural_translation);
-        }
+        $context = isset($key[1]) ? array_shift($key) : '';
+        $original = array_shift($key);
+        $plural = array_shift($message);
+        $translation = array_shift($message);
+        $plural_translation = array_shift($message);
+
+        $entry = $translations->insert($context, $original, $plural);
+        $entry->setTranslation($translation);
+        $entry->setPluralTranslation($plural_translation);
     }
 }