use translate macro in template

KuceraMartin · KuceraMartin · commit 253b6221f7aa · 2017-07-04T11:45:47.000+02:00
diff --git a/src/Datagrid.blocks.latte b/src/Datagrid.blocks.latte
@@ -88,7 +88,7 @@
 {/define}
 
 {define row-actions-edit-link}
-	<a href="{link edit! $primary}" class="ajax" data-datagrid-edit>{$control->translate(nextras.datagrid.edit.label)}</a>
+	<a href="{link edit! $primary}" class="ajax" data-datagrid-edit>{_}nextras.datagrid.edit.label{/_}</a>
 {/define}
 
 {define row}
@@ -160,23 +160,23 @@
 {define pagination}
 	<div class="grid-paginator">
 		{if $paginator->isFirst()}
-			<span>« {$control->translate(nextras.datagrid.pagination.first)}</span>
-			<span>« {$control->translate(nextras.datagrid.pagination.previous)}</span>
+			<span>« {_}nextras.datagrid.pagination.first{/_}</span>
+			<span>« {_}nextras.datagrid.pagination.previous{/_}</span>
 		{else}
-			<a href="{link paginate!, 'page' => 1}" class="ajax">« {$control->translate(nextras.datagrid.pagination.first)}</a>
-			<a href="{link paginate!, 'page' => $paginator->page - 1}" class="ajax">« {$control->translate(nextras.datagrid.pagination.previous)}</a>
+			<a href="{link paginate!, 'page' => 1}" class="ajax">« {_}nextras.datagrid.pagination.first{/_}</a>
+			<a href="{link paginate!, 'page' => $paginator->page - 1}" class="ajax">« {_}nextras.datagrid.pagination.previous{/_}</a>
 		{/if}
 
 		<span>
 			<span>{$paginator->page}</span> / <span>{$paginator->pageCount}</span>
 		</span>
 
 		{if $paginator->isLast()}
-			<span>{$control->translate(nextras.datagrid.pagination.next)} »</span>
-			<span>{$control->translate(nextras.datagrid.pagination.last)} »</span>
+			<span>{_}nextras.datagrid.pagination.next{/_} »</span>
+			<span>{_}nextras.datagrid.pagination.last{/_} »</span>
 		{else}
-			<a href="{link paginate!, 'page' => $paginator->page + 1}" class="ajax">{$control->translate(nextras.datagrid.pagination.next)} »</a>
-			<a href="{link paginate!, 'page' => $paginator->pageCount}" class="ajax">{$control->translate(nextras.datagrid.pagination.last)} »</a>
+			<a href="{link paginate!, 'page' => $paginator->page + 1}" class="ajax">{_}nextras.datagrid.pagination.next{/_} »</a>
+			<a href="{link paginate!, 'page' => $paginator->pageCount}" class="ajax">{_}nextras.datagrid.pagination.last{/_} »</a>
 		{/if}
 	</div>
 {/define}
diff --git a/src/Datagrid.php b/src/Datagrid.php
@@ -273,6 +273,10 @@ public function translate($s, $count = null)
 
 	public function render()
 	{
+		if (!$this->template instanceof Template) {
+			throw new LogicException('Template must be instance of ' . Template::class);
+		}
+
 		if ($this->filterFormFactory) {
 			$this['form']['filter']->setDefaults($this->filter);
 		}
@@ -288,6 +292,8 @@ public function render()
 		$this->template->showFilterCancel = $this->filterDataSource != $this->filterDefaults; // @ intentionaly
 		$this->template->setFile(__DIR__ . '/Datagrid.latte');
 
+		$this->template->setTranslator($this->translator);
+
 		$this->onRender($this);
 		$this->template->render();
 	}
diff --git a/src/exceptions.php b/src/exceptions.php
@@ -13,3 +13,8 @@
 class InvalidArgumentException extends \InvalidArgumentException
 {
 }
+
+
+class LogicException extends \LogicException
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,10 @@ public function translate($s, $count = null)`
`273`	`273`
`274`	`274`	`public function render()`
`275`	`275`	`{`
	`276`	`+ if (!$this->template instanceof Template) {`
	`277`	`+ throw new LogicException('Template must be instance of ' . Template::class);`
	`278`	`+ }`
	`279`	`+`
`276`	`280`	`if ($this->filterFormFactory) {`
`277`	`281`	`$this['form']['filter']->setDefaults($this->filter);`
`278`	`282`	`}`
`@@ -288,6 +292,8 @@ public function render()`
`288`	`292`	`$this->template->showFilterCancel = $this->filterDataSource != $this->filterDefaults; // @ intentionaly`
`289`	`293`	`$this->template->setFile(__DIR__ . '/Datagrid.latte');`
`290`	`294`
	`295`	`+ $this->template->setTranslator($this->translator);`
	`296`	`+`
`291`	`297`	`$this->onRender($this);`
`292`	`298`	`$this->template->render();`
`293`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,8 @@`
`13`	`13`	`class InvalidArgumentException extends \InvalidArgumentException`
`14`	`14`	`{`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+`
	`18`	`+class LogicException extends \LogicException`
	`19`	`+{`
	`20`	`+}`