Translation texts with namespaces #82
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,9 @@ | |
| } | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { "Nextras\\Datagrid\\": "src" }, | ||
| "classmap": [ | ||
| "src/exceptions.php" | ||
| ] | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,6 @@ | |
| use Nette\Bridges\ApplicationLatte\Template; | ||
| use Nette\Forms\Container; | ||
| use Nette\Forms\Controls\Button; | ||
| use Nette\Utils\Html; | ||
| use Nette\Utils\Paginator; | ||
| use Nette\Localization\ITranslator; | ||
|
|
@@ -94,6 +93,13 @@ class Datagrid extends UI\Control | |
| protected $cellsTemplates = []; | ||
|
|
||
|
|
||
| public function __construct() | ||
| { | ||
| parent::__construct(); | ||
| $this->translator = new DefaultTranslator(DefaultTranslator::LANG_EN); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Adds column | ||
| * @param string | ||
|
|
@@ -256,10 +262,9 @@ public function getTranslator() | |
|
|
||
| public function translate($s, $count = null) | ||
|
There was a problem hiding this comment. Well, it is still used at line 115 |
||
| { | ||
| return $s == null || $s instanceof Html // intentionally == | ||
| ? $s | ||
| : $this->getTranslator()->translate((string) $s, $count); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -268,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); | ||
| } | ||
|
|
@@ -283,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(); | ||
| } | ||
|
|
@@ -338,11 +349,11 @@ protected function getData($key = null) | |
| { | ||
| if (!$this->data) { | ||
| $onlyRow = $key !== null && $this->presenter->isAjax(); | ||
|
|
||
| if ($this->orderColumn !== NULL && !isset($this->columns[$this->orderColumn])) { | ||
| $this->orderColumn = NULL; | ||
| } | ||
|
|
||
| if (!$onlyRow && $this->paginator) { | ||
| $itemsCount = call_user_func( | ||
| $this->paginatorItemsCountCallback, | ||
|
|
@@ -429,10 +440,10 @@ public function createComponentForm() | |
| if ($this->filterFormFactory) { | ||
| $form['filter'] = call_user_func($this->filterFormFactory); | ||
| if (!isset($form['filter']['filter'])) { | ||
| $form['filter']->addSubmit('filter', 'nextras.datagrid.filter.submit'); | ||
| } | ||
| if (!isset($form['filter']['cancel'])) { | ||
| $form['filter']->addSubmit('cancel', 'nextras.datagrid.filter.cancel'); | ||
| } | ||
|
|
||
| $this->prepareFilterDefaults($form['filter']); | ||
|
|
@@ -446,9 +457,9 @@ public function createComponentForm() | |
| $form['edit'] = call_user_func($this->editFormFactory, $data); | ||
|
|
||
| if (!isset($form['edit']['save'])) | ||
| $form['edit']->addSubmit('save', 'nextras.datagrid.edit.save'); | ||
| if (!isset($form['edit']['cancel'])) | ||
| $form['edit']->addSubmit('cancel', 'nextras.datagrid.edit.cancel'); | ||
| if (!isset($form['edit'][$this->rowPrimaryKey])) | ||
| $form['edit']->addHidden($this->rowPrimaryKey); | ||
|
|
||
|
|
@@ -460,20 +471,18 @@ public function createComponentForm() | |
| if ($this->globalActions) { | ||
| $actions = array_map(function($row) { return $row[0]; }, $this->globalActions); | ||
| $form['actions'] = new Container(); | ||
| $form['actions']->addSelect('action', 'nextras.datagrid.action.label', $actions) | ||
| ->setPrompt('nextras.datagrid.action.prompt'); | ||
|
|
||
| $rows = []; | ||
| foreach ($this->getData() as $row) { | ||
| $rows[$this->getter($row, $this->rowPrimaryKey)] = null; | ||
| } | ||
| $form['actions']->addCheckboxList('items', '', $rows); | ||
| $form['actions']->addSubmit('process', 'nextras.datagrid.action.process'); | ||
| } | ||
|
|
||
| $form->setTranslator($this->translator); | ||
|
There was a problem hiding this comment. if the translator would be lazy, we would probably set it only for render, eg. in render method. |
||
|
|
||
| $form->onSuccess[] = function() {}; // fix for Nette Framework 2.0.x | ||
| $form->onSubmit[] = [$this, 'processForm']; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * This file is part of the Nextras community extensions of Nette Framework | ||
| * | ||
| * @license MIT | ||
| * @link https://github.com/nextras | ||
| */ | ||
|
|
||
| namespace Nextras\Datagrid; | ||
|
|
||
| use Nette\Localization\ITranslator; | ||
| use Nette\SmartObject; | ||
|
|
||
|
|
||
| class DefaultTranslator implements ITranslator | ||
| { | ||
| use SmartObject; | ||
|
|
||
|
|
||
| const LANG_EN = 'en'; | ||
| const LANG_CS = 'cs'; | ||
|
|
||
| const TRANSLATIONS = [ | ||
| self::LANG_EN => [ | ||
|
There was a problem hiding this comment. Not sure I want support more langs :| There was a problem hiding this comment. Well, czech is quite popular language, I've heard =) |
||
| 'nextras.datagrid.filter.submit' => 'Filter', | ||
| 'nextras.datagrid.filter.cancel' => 'Cancel', | ||
|
|
||
| 'nextras.datagrid.edit.label' => 'Edit', | ||
| 'nextras.datagrid.edit.save' => 'Save', | ||
| 'nextras.datagrid.edit.cancel' => 'Cancel', | ||
|
|
||
| 'nextras.datagrid.action.label' => 'Action', | ||
| 'nextras.datagrid.action.prompt' => '- select action -', | ||
| 'nextras.datagrid.action.process' => 'Do', | ||
|
|
||
| 'nextras.datagrid.pagination.first' => 'First', | ||
| 'nextras.datagrid.pagination.previous' => 'Previous', | ||
| 'nextras.datagrid.pagination.next' => 'Next', | ||
| 'nextras.datagrid.pagination.last' => 'Last', | ||
| ], | ||
| self::LANG_CS => [ | ||
| 'nextras.datagrid.filter.submit' => 'Filtrovat', | ||
| 'nextras.datagrid.filter.cancel' => 'Zrušit', | ||
|
|
||
| 'nextras.datagrid.edit.label' => 'Upravit', | ||
| 'nextras.datagrid.edit.save' => 'Uložit', | ||
| 'nextras.datagrid.edit.cancel' => 'Zrušit', | ||
|
|
||
| 'nextras.datagrid.action.label' => 'Akce', | ||
| 'nextras.datagrid.action.prompt' => '- zvolte akci -', | ||
| 'nextras.datagrid.action.process' => 'OK', | ||
|
|
||
| 'nextras.datagrid.pagination.first' => 'První', | ||
| 'nextras.datagrid.pagination.previous' => 'Poslední', | ||
| 'nextras.datagrid.pagination.next' => 'Další', | ||
| 'nextras.datagrid.pagination.last' => 'Předchozí', | ||
| ], | ||
| ]; | ||
|
|
||
|
|
||
| /** @var string */ | ||
| private $language; | ||
|
|
||
|
|
||
| public function __construct($language) | ||
| { | ||
| if (!isset(self::TRANSLATIONS[$language])) { | ||
| throw new InvalidArgumentException("Unsupported language '$language'"); | ||
| } | ||
| $this->language = $language; | ||
| } | ||
|
|
||
|
|
||
| public function translate($message, $count = NULL) | ||
| { | ||
| return isset(self::TRANSLATIONS[$this->language][$message]) ? self::TRANSLATIONS[$this->language][$message] : $message; | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?php | ||
|
There was a problem hiding this comment. IMO it's more appropriate to split these into single files |
||
|
|
||
| /** | ||
| * This file is part of the Nextras community extensions of Nette Framework | ||
| * | ||
| * @license MIT | ||
| * @link https://github.com/nextras | ||
| */ | ||
|
|
||
| namespace Nextras\Datagrid; | ||
|
|
||
|
|
||
| class InvalidArgumentException extends \InvalidArgumentException | ||
| { | ||
| } | ||
|
|
||
|
|
||
| class LogicException extends \LogicException | ||
| { | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about making this lazy by getTranslator()