Commitd106aa3

authored and

committed

[Translation] Allow using dashes in locale when linting Xliff files

1 parentaad1d09 commitd106aa3Copy full SHA for d106aa3

File tree

+13

-2

lines changed

src/Symfony/Component/Translation
- Command
  - XliffLintCommand.php
- Tests/Command
  - XliffLintCommandTest.php

+13

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,12 @@ private function validate(string $content, string $file = null): array`
`129`	`129`	`$document->loadXML($content);`
`130`	`130`
`131`	`131`	`if (null !==$targetLanguage =$this->getTargetLanguageFromFile($document)) {`
`132`		`-$normalizedLocale =preg_quote(str_replace('-','_',$targetLanguage),'/');`
	`132`	`+$normalizedLocalePattern =sprintf('(%s\|%s)',preg_quote($targetLanguage,'/'),preg_quote(str_replace('-','_',$targetLanguage),'/'));`
`133`	`133`	`// strict file names require translation files to be named '____.locale.xlf'`
`134`	`134`	`// otherwise, both '____.locale.xlf' and 'locale.____.xlf' are allowed`
`135`	`135`	`// also, the regexp matching must be case-insensitive, as defined for 'target-language' values`
`136`	`136`	`// http://docs.oasis-open.org/xliff/v1.2/os/xliff-core.html#target-language`
`137`		`-$expectedFilenamePattern =$this->requireStrictFileNames ?sprintf('/^.\.(?i:%s)\.(?:xlf\|xliff)/',$normalizedLocale) :sprintf('/^(?:.\.(?i:%s)\|(?i:%s)\..*)\.(?:xlf\|xliff)/',$normalizedLocale,$normalizedLocale);`
	`137`	`+$expectedFilenamePattern =$this->requireStrictFileNames ?sprintf('/^.\.(?i:%s)\.(?:xlf\|xliff)/',$normalizedLocalePattern) :sprintf('/^(?:.\.(?i:%s)\|(?i:%s)\..*)\.(?:xlf\|xliff)/',$normalizedLocalePattern,$normalizedLocalePattern);`
`138`	`138`
`139`	`139`	`if (0 ===preg_match($expectedFilenamePattern,basename($file))) {`
`140`	`140`	`$errors[] = [`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,17 @@ public function testLintTargetLanguageIsCaseInsensitive()`
`105`	`105`	`$this->assertStringContainsString('[OK] All 1 XLIFF files contain valid syntax.',trim($tester->getDisplay()));`
`106`	`106`	`}`
`107`	`107`
	`108`	`+publicfunctiontestLintSucceedsWhenLocaleInFileAndInTargetLanguageNameUsesDashesInsteadOfUnderscores()`
	`109`	`+ {`
	`110`	`+$tester =$this->createCommandTester();`
	`111`	`+$filename =$this->createFile('note','en-GB','messages.en-GB.xlf');`
	`112`	`+`
	`113`	`+$tester->execute(['filename' =>$filename], ['decorated' =>false]);`
	`114`	`+`
	`115`	`+$this->assertSame(0,$tester->getStatusCode());`
	`116`	`+$this->assertStringContainsString('[OK] All 1 XLIFF files contain valid syntax.',trim($tester->getDisplay()));`
	`117`	`+ }`
	`118`	`+`
`108`	`119`	`publicfunctiontestLintFileNotReadable()`
`109`	`120`	`{`
`110`	`121`	`$this->expectException(\RuntimeException::class);`

Comments

(0)