From 90f938554585099e413fd6e56668f77db4b21e4b Mon Sep 17 00:00:00 2001
From: RomainMazB <romainmazb@gmail.com>
Date: Mon, 7 Jun 2021 22:27:01 +0200
Subject: [PATCH 1/3] Improve stubs adding missing translation keys

---
 .../Console/controller/_list_toolbar.stub        |  6 +++---
 src/Scaffold/Console/controller/create.stub      | 12 ++++++------
 src/Scaffold/Console/controller/preview.stub     |  2 +-
 src/Scaffold/Console/controller/update.stub      | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Scaffold/Console/controller/_list_toolbar.stub b/src/Scaffold/Console/controller/_list_toolbar.stub
index f6aae31be..62c47434d 100644
--- a/src/Scaffold/Console/controller/_list_toolbar.stub
+++ b/src/Scaffold/Console/controller/_list_toolbar.stub
@@ -2,7 +2,7 @@
     <a
         href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}/create') ?>"
         class="btn btn-primary oc-icon-plus">
-        New {{title_singular_name}}
+        <?= e(trans('backend::lang.list.new_name', ['name' => '{{title_singular_name}}'])) ?>
     </a>
 
     <button
@@ -10,12 +10,12 @@
         disabled="disabled"
         onclick="$(this).data('request-data', { checked: $('.control-list').listWidget('getChecked') })"
         data-request="onDelete"
-        data-request-confirm="Are you sure you want to delete the selected {{title_plural_name}}?"
+        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>
-        Delete selected
+        <?= e(trans('backend::lang.list.delete_selected')) ?>
     </button>
 </div>
diff --git a/src/Scaffold/Console/controller/create.stub b/src/Scaffold/Console/controller/create.stub
index 4afb14ae6..f66e9a0da 100644
--- a/src/Scaffold/Console/controller/create.stub
+++ b/src/Scaffold/Console/controller/create.stub
@@ -19,21 +19,21 @@
                     type="submit"
                     data-request="onSave"
                     data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Creating {{singular_name}}..."
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => '{{singular_name}}'])) ?>"
                     class="btn btn-primary">
-                    Create
+                    <?= 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="Creating {{singular_name}}..."
+                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => '{{singular_name}}'])) ?>"
                     class="btn btn-default">
-                    Create and Close
+                    <?= e(trans('backend::lang.form.create_and_close')) ?>
                 </button>
                 <span class="btn-text">
-                    or <a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">Cancel</a>
+                    <?= 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>
@@ -43,6 +43,6 @@
 <?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">Return to {{lower_title_name}} list</a></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 ?>
diff --git a/src/Scaffold/Console/controller/preview.stub b/src/Scaffold/Console/controller/preview.stub
index df5524cd4..5a7f3459a 100644
--- a/src/Scaffold/Console/controller/preview.stub
+++ b/src/Scaffold/Console/controller/preview.stub
@@ -14,6 +14,6 @@
 <?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">Return to {{lower_title_name}} list</a></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 ?>
diff --git a/src/Scaffold/Console/controller/update.stub b/src/Scaffold/Console/controller/update.stub
index ce472060a..fa488f73f 100644
--- a/src/Scaffold/Console/controller/update.stub
+++ b/src/Scaffold/Console/controller/update.stub
@@ -20,28 +20,28 @@
                     data-request="onSave"
                     data-request-data="redirect:0"
                     data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="Saving {{singular_name}}..."
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => '{{singular_name}}'])) ?>"
                     class="btn btn-primary">
-                    <u>S</u>ave
+                    <?= 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="Saving {{singular_name}}..."
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving_name', ['name' => '{{singular_name}}'])) ?>"
                     class="btn btn-default">
-                    Save and Close
+                    <?= 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="Deleting {{singular_name}}..."
-                    data-request-confirm="Delete this {{lower_singular_name}}?">
+                    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">
-                    or <a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">Cancel</a>
+                    <?= 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>
@@ -51,6 +51,6 @@
 <?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">Return to {{lower_title_name}} list</a></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 ?>

From feeca44c7959c7969cee414c6cc581d9c02200cc Mon Sep 17 00:00:00 2001
From: RomainMazB <romainmazb@gmail.com>
Date: Wed, 9 Jun 2021 00:04:30 +0200
Subject: [PATCH 2/3] Revert "Improve stubs adding missing translation keys"

This reverts commit 90f938554585099e413fd6e56668f77db4b21e4b.
---
 .../Console/controller/_list_toolbar.stub        |  6 +++---
 src/Scaffold/Console/controller/create.stub      | 12 ++++++------
 src/Scaffold/Console/controller/preview.stub     |  2 +-
 src/Scaffold/Console/controller/update.stub      | 16 ++++++++--------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Scaffold/Console/controller/_list_toolbar.stub b/src/Scaffold/Console/controller/_list_toolbar.stub
index 62c47434d..f6aae31be 100644
--- a/src/Scaffold/Console/controller/_list_toolbar.stub
+++ b/src/Scaffold/Console/controller/_list_toolbar.stub
@@ -2,7 +2,7 @@
     <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}}'])) ?>
+        New {{title_singular_name}}
     </a>
 
     <button
@@ -10,12 +10,12 @@
         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-request-confirm="Are you sure you want to delete the selected {{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')) ?>
+        Delete selected
     </button>
 </div>
diff --git a/src/Scaffold/Console/controller/create.stub b/src/Scaffold/Console/controller/create.stub
index f66e9a0da..4afb14ae6 100644
--- a/src/Scaffold/Console/controller/create.stub
+++ b/src/Scaffold/Console/controller/create.stub
@@ -19,21 +19,21 @@
                     type="submit"
                     data-request="onSave"
                     data-hotkey="ctrl+s, cmd+s"
-                    data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => '{{singular_name}}'])) ?>"
+                    data-load-indicator="Creating {{singular_name}}..."
                     class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.create')) ?>
+                    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}}'])) ?>"
+                    data-load-indicator="Creating {{singular_name}}..."
                     class="btn btn-default">
-                    <?= e(trans('backend::lang.form.create_and_close')) ?>
+                    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>
+                    or <a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">Cancel</a>
                 </span>
             </div>
         </div>
@@ -43,6 +43,6 @@
 <?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>
+    <p><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>" class="btn btn-default">Return to {{lower_title_name}} list</a></p>
 
 <?php endif ?>
diff --git a/src/Scaffold/Console/controller/preview.stub b/src/Scaffold/Console/controller/preview.stub
index 5a7f3459a..df5524cd4 100644
--- a/src/Scaffold/Console/controller/preview.stub
+++ b/src/Scaffold/Console/controller/preview.stub
@@ -14,6 +14,6 @@
 <?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>
+    <p><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>" class="btn btn-default">Return to {{lower_title_name}} list</a></p>
 
 <?php endif ?>
diff --git a/src/Scaffold/Console/controller/update.stub b/src/Scaffold/Console/controller/update.stub
index fa488f73f..ce472060a 100644
--- a/src/Scaffold/Console/controller/update.stub
+++ b/src/Scaffold/Console/controller/update.stub
@@ -20,28 +20,28 @@
                     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}}'])) ?>"
+                    data-load-indicator="Saving {{singular_name}}..."
                     class="btn btn-primary">
-                    <?= e(trans('backend::lang.form.save')) ?>
+                    <u>S</u>ave
                 </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}}'])) ?>"
+                    data-load-indicator="Saving {{singular_name}}..."
                     class="btn btn-default">
-                    <?= e(trans('backend::lang.form.save_and_close')) ?>
+                    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}}'])) ?>">
+                    data-load-indicator="Deleting {{singular_name}}..."
+                    data-request-confirm="Delete this {{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>
+                    or <a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>">Cancel</a>
                 </span>
             </div>
         </div>
@@ -51,6 +51,6 @@
 <?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>
+    <p><a href="<?= Backend::url('{{lower_author}}/{{lower_plugin}}/{{lower_name}}') ?>" class="btn btn-default">Return to {{lower_title_name}} list</a></p>
 
 <?php endif ?>

From 0f90bb48ba1ac8105dffbfebf18793a28ed7c2ca Mon Sep 17 00:00:00 2001
From: RomainMazB <romainmazb@gmail.com>
Date: Wed, 9 Jun 2021 00:23:02 +0200
Subject: [PATCH 3/3] Add --with-translations option

---
 src/Scaffold/Console/CreateController.php     | 27 +++++++--
 .../_list_toolbar-with-translations.stub      | 21 +++++++
 .../controller/create-with-translations.stub  | 48 ++++++++++++++++
 .../controller/preview-with-translations.stub | 19 +++++++
 .../controller/update-with-translations.stub  | 56 +++++++++++++++++++
 5 files changed, 167 insertions(+), 4 deletions(-)
 create mode 100644 src/Scaffold/Console/controller/_list_toolbar-with-translations.stub
 create mode 100644 src/Scaffold/Console/controller/create-with-translations.stub
 create mode 100644 src/Scaffold/Console/controller/preview-with-translations.stub
 create mode 100644 src/Scaffold/Console/controller/update-with-translations.stub

diff --git a/src/Scaffold/Console/CreateController.php b/src/Scaffold/Console/CreateController.php
index 081d2ce99..dc0b85a4a 100644
--- a/src/Scaffold/Console/CreateController.php
+++ b/src/Scaffold/Console/CreateController.php
@@ -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.
      *
@@ -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.'],
         ];
     }
 }
diff --git a/src/Scaffold/Console/controller/_list_toolbar-with-translations.stub b/src/Scaffold/Console/controller/_list_toolbar-with-translations.stub
new file mode 100644
index 000000000..62c47434d
--- /dev/null
+++ b/src/Scaffold/Console/controller/_list_toolbar-with-translations.stub
@@ -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>
diff --git a/src/Scaffold/Console/controller/create-with-translations.stub b/src/Scaffold/Console/controller/create-with-translations.stub
new file mode 100644
index 000000000..f66e9a0da
--- /dev/null
+++ b/src/Scaffold/Console/controller/create-with-translations.stub
@@ -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 ?>
diff --git a/src/Scaffold/Console/controller/preview-with-translations.stub b/src/Scaffold/Console/controller/preview-with-translations.stub
new file mode 100644
index 000000000..5a7f3459a
--- /dev/null
+++ b/src/Scaffold/Console/controller/preview-with-translations.stub
@@ -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 ?>
diff --git a/src/Scaffold/Console/controller/update-with-translations.stub b/src/Scaffold/Console/controller/update-with-translations.stub
new file mode 100644
index 000000000..fa488f73f
--- /dev/null
+++ b/src/Scaffold/Console/controller/update-with-translations.stub
@@ -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 ?>