From bb536728e40ef133f074a8b09972eafd89035fe3 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 12 Feb 2018 13:45:20 +0100
Subject: [PATCH 1/3] Added support for name on the unit node

---
 src/Symfony/Component/Translation/CHANGELOG.md               | 1 +
 src/Symfony/Component/Translation/Dumper/XliffFileDumper.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index daab7fd3fc0eb..1b4d1f2ecf1d9 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
  * The `FileDumper::setBackup()` method is deprecated and will be removed in 5.0.
  * The `TranslationWriter::disableBackup()` method is deprecated and will be removed in 5.0.
+ * The `XliffFileDumper` will write "name" on the "unit" node. 
 
 4.0.0
 -----
diff --git a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
index d7e5ecc78c120..437a7f19b9519 100644
--- a/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
+++ b/src/Symfony/Component/Translation/Dumper/XliffFileDumper.php
@@ -146,6 +146,7 @@ private 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), '/+', '._'));
+            $translation->setAttribute('name', $source);
             $metadata = $messages->getMetadata($source, $domain);
 
             // Add notes section

From 0a81c170d0066304f4b4eb1acc06aa30e10cec35 Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 12 Feb 2018 13:48:07 +0100
Subject: [PATCH 2/3] Updated changelog

---
 src/Symfony/Component/Translation/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md
index 1b4d1f2ecf1d9..c3b00a334c0de 100644
--- a/src/Symfony/Component/Translation/CHANGELOG.md
+++ b/src/Symfony/Component/Translation/CHANGELOG.md
@@ -6,7 +6,7 @@ CHANGELOG
 
  * The `FileDumper::setBackup()` method is deprecated and will be removed in 5.0.
  * The `TranslationWriter::disableBackup()` method is deprecated and will be removed in 5.0.
- * The `XliffFileDumper` will write "name" on the "unit" node. 
+ * The `XliffFileDumper` will write "name" on the "unit" node when dumping XLIFF 2.0.
 
 4.0.0
 -----

From 95e58c92fd79bba6f9d8db9873d6f924b4f01e0c Mon Sep 17 00:00:00 2001
From: Tobias Nyholm <tobias.nyholm@gmail.com>
Date: Mon, 12 Feb 2018 14:46:11 +0100
Subject: [PATCH 3/3] Updated fixtures

---
 .../Translation/Tests/fixtures/resources-2.0-clean.xlf      | 6 +++---
 .../Translation/Tests/fixtures/resources-notes-meta.xlf     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf
index 06047dde542fe..efa69b27ffb5a 100644
--- a/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf
+++ b/src/Symfony/Component/Translation/Tests/fixtures/resources-2.0-clean.xlf
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="fr-FR" trgLang="en-US">
   <file id="messages.en_US">
-    <unit id="LCa0a2j">
+    <unit id="LCa0a2j" name="foo">
       <segment>
         <source>foo</source>
         <target>bar</target>
       </segment>
     </unit>
-    <unit id="LHDhK3o">
+    <unit id="LHDhK3o" name="key">
       <segment>
         <source>key</source>
         <target order="1"></target>
       </segment>
     </unit>
-    <unit id="2DA_bnh">
+    <unit id="2DA_bnh" name="key.with.cdata">
       <segment>
         <source>key.with.cdata</source>
         <target><![CDATA[<source> & <target>]]></target>
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf b/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
index e9995fa8474c0..7d5bbd40f643f 100644
--- a/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
+++ b/src/Symfony/Component/Translation/Tests/fixtures/resources-notes-meta.xlf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:2.0" version="2.0" srcLang="fr-FR" trgLang="en-US">
   <file id="messages.en_US">
-    <unit id="LCa0a2j">
+    <unit id="LCa0a2j" name="foo">
       <notes>
         <note category="state">new</note>
         <note category="approved">true</note>
@@ -12,7 +12,7 @@
         <target>bar</target>
       </segment>
     </unit>
-    <unit id="uqWglk0">
+    <unit id="uqWglk0" name="baz">
       <notes>
         <note id="x">x_content</note>
         <note appliesTo="target" category="quality">Fuzzy</note>