IControl: removed translate(), it is just part of BaseControl

nette · Jun 30, 2016 · d260d62 · d260d62
1 parent 4473513
commit d260d62
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/src/Forms/IControl.php b/src/Forms/IControl.php
@@ -44,12 +44,4 @@ function getErrors();
 	 */
 	function isOmitted();
 
-	/**
-	 * Returns translated string.
-	 * @param  string
-	 * @param  int      plural count
-	 * @return string
-	 */
-	function translate($s, $count = NULL);
-
 }
diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -381,7 +381,10 @@ public function renderPairMulti(array $controls)
 				$description = ' ' . $control->getOption('description');
 
 			} elseif (is_string($description)) {
-				$description = ' ' . $this->getWrapper('control description')->setText($control->translate($description));
+				if ($control instanceof Nette\Forms\Controls\BaseControl) {
+					$description = $control->translate($description);
+				}
+				$description = ' ' . $this->getWrapper('control description')->setText($description);
 
 			} else {
 				$description = '';
@@ -437,7 +440,10 @@ public function renderControl(Nette\Forms\IControl $control)
 			$description = ' ' . $description;
 
 		} elseif (is_string($description)) {
-			$description = ' ' . $this->getWrapper('control description')->setText($control->translate($description));
+			if ($control instanceof Nette\Forms\Controls\BaseControl) {
+				$description = $control->translate($description);
+			}
+			$description = ' ' . $this->getWrapper('control description')->setText($description);
 
 		} else {
 			$description = '';

diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
@@ -67,7 +67,7 @@ public static function formatMessage(Rule $rule, $withValue = TRUE)
 			static $i = -1;
 			switch ($m[1]) {
 				case 'name': return $rule->control->getName();
-				case 'label': return $rule->control->translate($rule->control->caption);
+				case 'label': return $rule->control instanceof Controls\BaseControl ? $rule->control->translate($rule->control->caption) : NULL;
 				case 'value': return $withValue ? $rule->control->getValue() : $m[0];
 				default:
 					$args = is_array($rule->arg) ? $rule->arg : [$rule->arg];
@@ -135,7 +135,7 @@ public static function validateBlank(IControl $control)
 	 * Is control valid?
 	 * @return bool
 	 */
-	public static function validateValid(IControl $control)
+	public static function validateValid(Controls\BaseControl $control)
 	{
 		return $control->getRules()->validate();
 	}