HtmlTranslator, TextTranslator: added support for <br> empty tag

inteve · Feb 2, 2024 · 5437a9a · 5437a9a
1 parent c05d437
commit 5437a9a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/src/DefaultHtmlTagFactory.php b/src/DefaultHtmlTagFactory.php
@@ -25,6 +25,10 @@ public function createTag(MessageElement $element)
 				]));
 			}
 
+			if ($element->is('br')) {
+				return Html::el('br');
+			}
+
 			return NULL;
 		}
 	}
diff --git a/src/TextTranslator.php b/src/TextTranslator.php
@@ -67,6 +67,11 @@ private function translateMessage(MessageId $messageId, array $parameters)
 
 			foreach ($message->getElements() as $element) {
 				if ($element instanceof MessageElement) {
+					if ($element->is('br')) {
+						$res .= "\n";
+						continue;
+					}
+
 					$res .= $element->toText();
 
 				} else {

diff --git a/tests/Translator/HtmlTranslator.phpt b/tests/Translator/HtmlTranslator.phpt
@@ -18,6 +18,7 @@ function createTranslator($lang)
 				new Translator\Loaders\ArrayLoader(Translator\LanguageTag::fromString('en'), [
 					'homepage.hello' => 'Hello, <b>{$name}</b>!',
 					'homepage.unknow' => 'Hello, <muted>lorem <i>{$name|lower}!</i></muted>',
+					'homepage.br' => 'Hello<br>friends',
 				]),
 			]),
 			new Translator\Processors\TagProcessor
@@ -33,6 +34,12 @@ test('tag filtering', function () {
 });
 
 
+test('empty tags', function () {
+	$translator = createTranslator('en');
+	Assert::same('Hello<br>friends', (string) $translator->translate('homepage.br'));
+});
+
+
 test('NoTranslate', function () {
 	$translator = createTranslator('en');
 	Assert::same('homepage.hello', (string) $translator->translate(new Translator\NotTranslate('homepage.hello'), ['name' => 'John']));

diff --git a/tests/Translator/TextTranslator.phpt b/tests/Translator/TextTranslator.phpt
@@ -22,6 +22,7 @@ function createTranslator($lang)
 				new Translator\Loaders\ArrayLoader(Translator\LanguageTag::fromString('en'), [
 					'homepage.hello' => 'Hello!',
 					'homepage.hello2' => 'Hello, <b>{$name}</b>!',
+					'homepage.br' => 'Hello<br>friends',
 				]),
 			]),
 			new Translator\Processors\TagProcessor
@@ -48,6 +49,12 @@ test('with parameters', function () {
 });
 
 
+test('empty tags', function () {
+	$translator = createTranslator('en');
+	Assert::same("Hello\nfriends", (string) $translator->translate('homepage.br'));
+});
+
+
 test('NoTranslate', function () {
 	$translator = createTranslator('en');
 	Assert::same('homepage.hello', $translator->translate(new Translator\NotTranslate('homepage.hello'), ['name' => 'John']));