use translate macro in template

nextras · Jul 4, 2017 · afe04d3 · afe04d3
1 parent d095c67
commit afe04d3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
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 change
@@ Expand Up / @@ -13,3 +13,8 @@ @@
     class InvalidArgumentException extends \InvalidArgumentException
     {
     }
+    class LogicException extends \LogicException
+    {
+    }