BaseControl::getLabel() IHtmlString are not translated (#225)

MilanPala · dg · commit 487696138bfa · 2019-07-08T11:56:41.000+02:00
diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -276,7 +276,7 @@ public function getLabel($caption = null)
 		$label->for = $this->getHtmlId();
 		$caption = $caption === null ? $this->caption : $caption;
 		$translator = $this->getForm()->getTranslator();
-		$label->setText($translator ? $translator->translate($caption) : $caption);
+		$label->setText($translator && !$caption instanceof Nette\Utils\IHtmlString ? $translator->translate($caption) : $caption);
 		return $label;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public function getLabel($caption = null)`
`276`	`276`	`$label->for = $this->getHtmlId();`
`277`	`277`	`$caption = $caption === null ? $this->caption : $caption;`
`278`	`278`	`$translator = $this->getForm()->getTranslator();`
`279`		`- $label->setText($translator ? $translator->translate($caption) : $caption);`
	`279`	`+ $label->setText($translator && !$caption instanceof Nette\Utils\IHtmlString ? $translator->translate($caption) : $caption);`
`280`	`280`	`return $label;`
`281`	`281`	`}`
`282`	`282`