Merge pull request #51 from Crizz0/issue/50

Fix validation for unsubscribe link in email/ and help/ dir

Author: DavidIQ

src/Phpbb/TranslationValidator/Validator/FileValidator.php

@@ -328,7 +328,9 @@ public function validateEmail($sourceFile, $originFile)
 		{
 			foreach ($validateHtml[0] as $possibleHtml)
 			{
-				if (substr($possibleHtml, 0, 5) !== '<!-- ' || substr($possibleHtml, -4) !== ' -->')
+				if ((substr($possibleHtml, 0, 5) !== '<!-- ' || substr($possibleHtml, -4) !== ' -->')
+					&& (substr($possibleHtml, 0, 2) !== '<{' || substr($possibleHtml, -2) !== '}>')
+					)
 				{
 					$this->output->addMessage(Output::FATAL, 'Using additional HTML: ' . htmlspecialchars($possibleHtml), $originFile);
 				}

src/Phpbb/TranslationValidator/Validator/LangKeyValidator.php

@@ -741,8 +741,8 @@ public function validateHtml($file, $key, $sourceString, $originString)
 					else if (
 						in_array('</a>', $sourceHtml) ||
 						$this->originLanguagePath . 'common.php' === $file && $key === 'TRANSLATION_INFO' ||
-						$this->originLanguagePath . 'help_faq.php' === $file ||
-						$this->originLanguagePath . 'help_bbcode.php' === $file
+						$this->originLanguagePath . 'help/faq.php' === $file ||
+						$this->originLanguagePath . 'help/bbcode.php' === $file
 					)
 					{
 						// Source contains a link aswell, mostly IST changed the link to better match the language