Merge branch 'master' into patch-1

Author: Nyholm

Changelog.md

@@ -2,6 +2,19 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 
 
+## 1.0.0
+
+### Added
+
+- Support for php-translation/common: 1.0
+
+## 0.5.0
+
+### Added 
+
+- Support for php-translation/common: 0.3
+- Added the "name" attribute on the "unit" node for XLIFF 2.0. 
+
 ## 0.4.0
 
 ### Added

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^5.5 || ^7.0",
-        "php-translation/common": "^0.2.1",
+        "php-translation/common": "^1.0",
         "symfony/translation": "^2.7 || ^3.0 || ^4.0",
         "nyholm/nsa": "^1.1"
     },

src/Dumper/Port/SymfonyPort.php

@@ -38,6 +38,11 @@ public function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain,
         foreach ($messages->all($domain) as $source => $target) {
             $translation = $dom->createElement('unit');
             $translation->setAttribute('id', strtr(substr(base64_encode(hash('sha256', $source, true)), 0, 7), '/+', '._'));
+            $name = $source;
+            if (strlen($source) > 80) {
+                $name = substr(md5($source), -7);
+            }
+            $translation->setAttribute('name', $name);
             $metadata = $messages->getMetadata($source, $domain);
 
             // Add notes section

src/FileStorage.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Translation\Reader\TranslationReaderInterface;
 use Symfony\Component\Translation\Writer\TranslationWriterInterface;
 use Translation\Common\Model\Message;
+use Translation\Common\Model\MessageInterface;
 use Translation\Common\Storage;
 use Translation\Common\TransferableStorage;
 
@@ -98,7 +99,7 @@ public function get($locale, $domain, $key)
     /**
      * {@inheritdoc}
      */
-    public function create(Message $m)
+    public function create(MessageInterface $m)
     {
         $catalogue = $this->getCatalogue($m->getLocale());
         if (!$catalogue->defines($m->getKey(), $m->getDomain())) {
@@ -110,7 +111,7 @@ public function create(Message $m)
     /**
      * {@inheritdoc}
      */
-    public function update(Message $m)
+    public function update(MessageInterface $m)
     {
         $catalogue = $this->getCatalogue($m->getLocale());
         $catalogue->set($m->getKey(), $m->getTranslation(), $m->getDomain());

src/Loader/XliffLoader.php

@@ -151,7 +151,8 @@ private function getXmlErrors($internalErrors)
     {
         $errors = [];
         foreach (libxml_get_errors() as $error) {
-            $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
+            $errors[] = sprintf(
+                '[%s %s] %s (in %s - line %d, column %d)',
                 LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
                 $error->code,
                 trim($error->message),