Commit8bf12f8

authored and

committed

Fix wrong value in file id attribute for Xliff 2.0

1 parentd4f4d8a commit8bf12f8Copy full SHA for 8bf12f8

File tree

+31

-1

lines changed

+31

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,11 @@ private function dumpXliff2($defaultLocale, MessageCatalogue $messages, $domain,`
`141`	`141`	`$xliff->setAttribute('trgLang',str_replace('_','-',$messages->getLocale()));`
`142`	`142`
`143`	`143`	`$xliffFile =$xliff->appendChild($dom->createElement('file'));`
`144`		`-$xliffFile->setAttribute('id',$domain.'.'.$messages->getLocale());`
	`144`	`+if (MessageCatalogue::INTL_DOMAIN_SUFFIX ===substr($domain, -($suffixLength =\strlen(MessageCatalogue::INTL_DOMAIN_SUFFIX)))) {`
	`145`	`+$xliffFile->setAttribute('id',substr($domain,0, -$suffixLength).'.'.$messages->getLocale());`
	`146`	`+ }else {`
	`147`	`+$xliffFile->setAttribute('id',$domain.'.'.$messages->getLocale());`
	`148`	`+ }`
`145`	`149`
`146`	`150`	`foreach ($messages->all($domain)as$source =>$target) {`
`147`	`151`	`$translation =$dom->createElement('unit');`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,21 @@ public function testFormatCatalogueXliff2()`
`54`	`54`	`);`
`55`	`55`	`}`
`56`	`56`
	`57`	`+publicfunctiontestFormatIcuCatalogueXliff2()`
	`58`	`+ {`
	`59`	`+$catalogue =newMessageCatalogue('en_US');`
	`60`	`+$catalogue->add([`
	`61`	`+'foo' =>'bar',`
	`62`	`+ ],'messages'.MessageCatalogue::INTL_DOMAIN_SUFFIX);`
	`63`	`+`
	`64`	`+$dumper =newXliffFileDumper();`
	`65`	`+`
	`66`	`+$this->assertStringEqualsFile(`
	`67`	`+__DIR__.'/../fixtures/resources-2.0+intl-icu.xlf',`
	`68`	`+$dumper->formatCatalogue($catalogue,'messages'.MessageCatalogue::INTL_DOMAIN_SUFFIX, ['default_locale' =>'fr_FR','xliff_version' =>'2.0'])`
	`69`	`+ );`
	`70`	`+ }`
	`71`	`+`
`57`	`72`	`publicfunctiontestFormatCatalogueWithCustomToolInfo()`
`58`	`73`	`{`
`59`	`74`	`$options = [`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,11 @@`
	`1`	`+<?xml version="1.0" encoding="utf-8"?>`
	`2`	`+<xliffxmlns="urn:oasis:names:tc:xliff:document:2.0"version="2.0"srcLang="fr-FR"trgLang="en-US">`
	`3`	`+ <fileid="messages.en_US">`
	`4`	`+ <unitid="LCa0a2j"name="foo">`
	`5`	`+ <segment>`
	`6`	`+ <source>foo</source>`
	`7`	`+ <target>bar</target>`
	`8`	`+ </segment>`
	`9`	`+ </unit>`
	`10`	`+ </file>`
	`11`	`+</xliff>`

Comments

(0)