Skip to content

Improve stubs adding missing translation keys #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RomainMazB wants to merge 4 commits into from
Closed

Improve stubs adding missing translation keys #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90f9385
Improve stubs adding missing translation keys
RomainMazB Jun 7, 2021
feeca44
Revert "Improve stubs adding missing translation keys"
RomainMazB Jun 8, 2021
0f90bb4
Add --with-translations option
RomainMazB Jun 8, 2021
ab3e7c2
Merge branch 'wintercms:develop' into develop
RomainMazB Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/Scaffold/Console/CreateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,34 @@ class CreateController extends GeneratorCommand
* @var array
*/
protected $stubs = [
'controller/_list_toolbar.stub' => 'controllers/{{lower_name}}/_list_toolbar.htm',
'controller/config_form.stub' => 'controllers/{{lower_name}}/config_form.yaml',
'controller/config_list.stub' => 'controllers/{{lower_name}}/config_list.yaml',
'controller/create.stub' => 'controllers/{{lower_name}}/create.htm',
'controller/index.stub' => 'controllers/{{lower_name}}/index.htm',
'controller/preview.stub' => 'controllers/{{lower_name}}/preview.htm',
'controller/update.stub' => 'controllers/{{lower_name}}/update.htm',
'controller/controller.stub' => 'controllers/{{studly_name}}.php',
];

/** @inheritDoc */
public function handle()
{
if ($this->option('with-translations')) {
$this->stubs = array_merge($this->stubs, [
'controller/_list_toolbar-with-translations.stub' => 'controllers/{{lower_name}}/_list_toolbar.htm',
'controller/create-with-translations.stub' => 'controllers/{{lower_name}}/create.htm',
'controller/preview-with-translations.stub' => 'controllers/{{lower_name}}/preview.htm',
'controller/update-with-translations.stub' => 'controllers/{{lower_name}}/update.htm',
]);
} else {
$this->stubs = array_merge($this->stubs, [
'controller/_list_toolbar.stub' => 'controllers/{{lower_name}}/_list_toolbar.htm',
'controller/create.stub' => 'controllers/{{lower_name}}/create.htm',
'controller/preview.stub' => 'controllers/{{lower_name}}/preview.htm',
'controller/update.stub' => 'controllers/{{lower_name}}/update.htm',
]);
}

parent::handle(); // TODO: Change the autogenerated stub
}

/**
* Prepare variables for stubs.
*
Expand Down Expand Up @@ -99,6 +117,7 @@ protected function getOptions()
return [
['force', null, InputOption::VALUE_NONE, 'Overwrite existing files with generated ones.'],
['model', null, InputOption::VALUE_OPTIONAL, 'Define which model name to use, otherwise the singular controller name is used.'],
['with-translations', null, InputOption::VALUE_NONE, 'Generate view files with translation keys.'],
];
}
}
21 changes: 21 additions & 0 deletions src/Scaffold/Console/controller/_list_toolbar-with-translations.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<div data-control="toolbar">
<a
href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}/create') ?>"
class="btn btn-primary oc-icon-plus">
<?= e(trans('backend::lang.list.new_name', ['name' => '{{title_singular_name}}'])) ?>
</a>

<button
class="btn btn-danger oc-icon-trash-o"
disabled="disabled"
onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
data-request="onDelete"
data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete_name', ['name' => '{{title_plural_name}}'])) ?>"
data-trigger-action="enable"
data-trigger=".control-list input[type=checkbox]"
data-trigger-condition="checked"
data-request-success="$(this).prop('disabled', 'disabled')"
data-stripe-load-indicator>
<?= e(trans('backend::lang.list.delete_selected')) ?>
</button>
</div>
48 changes: 48 additions & 0 deletions src/Scaffold/Console/controller/create-with-translations.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">{{title_name}}</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>

<?php if (!$this->fatalError): ?>

<?= Form::open(['class' => 'layout']) ?>

<div class="layout-row">
<?= $this->formRender() ?>
</div>

<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => '{{singular_name}}'])) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.create')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => '{{singular_name}}'])) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.create_and_close')) ?>
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>

<?= Form::close() ?>

<?php else: ?>

<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list_name', ['name' => '{{lower_title_name}}'])) ?></a></p>

<?php endif ?>
19 changes: 19 additions & 0 deletions src/Scaffold/Console/controller/preview-with-translations.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">{{title_name}}</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>

<?php if (!$this->fatalError): ?>

<div class="form-preview">
<?= $this->formRenderPreview() ?>
</div>

<?php else: ?>

<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list_name', ['name' => '{{lower_title_name}}'])) ?></a></p>

<?php endif ?>
56 changes: 56 additions & 0 deletions src/Scaffold/Console/controller/update-with-translations.stub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?php Block::put('breadcrumb') ?>
<ul>
<li><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">{{title_name}}</a></li>
<li><?= e($this->pageTitle) ?></li>
</ul>
<?php Block::endPut() ?>

<?php if (!$this->fatalError): ?>

<?= Form::open(['class' => 'layout']) ?>

<div class="layout-row">
<?= $this->formRender() ?>
</div>

<div class="form-buttons">
<div class="loading-indicator-container">
<button
type="submit"
data-request="onSave"
data-request-data="redirect:0"
data-hotkey="ctrl+s, cmd+s"
data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => '{{singular_name}}'])) ?>"
class="btn btn-primary">
<?= e(trans('backend::lang.form.save')) ?>
</button>
<button
type="button"
data-request="onSave"
data-request-data="close:1"
data-hotkey="ctrl+enter, cmd+enter"
data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => '{{singular_name}}'])) ?>"
class="btn btn-default">
<?= e(trans('backend::lang.form.save_and_close')) ?>
</button>
<button
type="button"
class="oc-icon-trash-o btn-icon danger pull-right"
data-request="onDelete"
data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => '{{singular_name}}'])) ?>"
data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete_name', ['name' => '{{lower_singular_name}}'])) ?>">
</button>
<span class="btn-text">
<?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
</span>
</div>
</div>

<?= Form::close() ?>

<?php else: ?>

<p class="flash-message static error"><?= e($this->fatalError) ?></p>
<p><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list_name', ['name' => '{{lower_title_name}}'])) ?></a></p>

<?php endif ?>