Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/Commands/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ protected function createAdminUser(): void
'email' => 'required|email|max:150',
'password' => 'required|max:32|min:6'
], [], [
'name' => trans('juzaweb::app.name'),
'email' => trans('juzaweb::app.email'),
'password' => trans('juzaweb::app.password')
'name' => trans('installer::message.environment.wizard.form.name'),
'email' => trans('installer::message.environment.wizard.form.email'),
'password' => trans('installer::message.environment.wizard.form.password')
]);

if ($validator->fails()) {
Expand Down
8 changes: 4 additions & 4 deletions src/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ public function save(Request $request)
'password' => 'required|max:32|min:8|confirmed',
'password_confirmation' => 'required|max:32|min:8',
], [], [
'name' => trans('juzaweb::app.name'),
'email' => trans('juzaweb::app.email'),
'password' => trans('juzaweb::app.password'),
'password_confirmation' => trans('juzaweb::app.confirm_password')
'name' => trans('installer::message.environment.wizard.form.name'),
'email' => trans('installer::message.environment.wizard.form.email'),
'password' => trans('installer::message.environment.wizard.form.password'),
'password_confirmation' => trans('installer::message.environment.wizard.form.password_confirmation')
]);

if ($validator->fails()) {
Expand Down
7 changes: 4 additions & 3 deletions src/resources/lang/en/message.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
'next' => 'Next Step',
'back' => 'Previous',
'finish' => 'Install',
'please_wait' => 'Please Wait...',
'forms' => [
'error_title' => 'The Following errors occurred:',
],
Expand Down Expand Up @@ -122,11 +123,11 @@

'pusher_label' => 'Pusher',
'pusher_app_id_label' => 'Pusher App Id',
'pusher_app_id_palceholder' => 'Pusher App Id',
'pusher_app_id_placeholder' => 'Pusher App Id',
'pusher_app_key_label' => 'Pusher App Key',
'pusher_app_key_palceholder' => 'Pusher App Key',
'pusher_app_key_placeholder' => 'Pusher App Key',
'pusher_app_secret_label' => 'Pusher App Secret',
'pusher_app_secret_palceholder' => 'Pusher App Secret',
'pusher_app_secret_placeholder' => 'Pusher App Secret',
],
'buttons' => [
'setup_database' => 'Setup Database',
Expand Down
2 changes: 1 addition & 1 deletion src/resources/views/admin.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<script type="text/javascript">
$('form').on('submit', function () {
$('.btn-submit')
.html("{{ trans('juzaweb::app.please_wait') }}")
.html("{{ trans('installer::message.please_wait') }}")
.prop('disabled', true);
});
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/resources/views/environment.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function showApplicationSettings() {

$('form').on('submit', function() {
$('.btn-submit')
.html("{{ trans('juzaweb::app.please_wait') }}")
.html("{{ trans('installer::message.please_wait') }}")
.prop('disabled', true);
});
</script>
Expand Down
Loading