Skip to content

Commit

Permalink
Create translation system
Browse files Browse the repository at this point in the history
  • Loading branch information
RazorMeister committed Jul 11, 2019
1 parent 537a1f9 commit 7479a3c
Show file tree
Hide file tree
Showing 14 changed files with 208 additions and 64 deletions.
8 changes: 4 additions & 4 deletions src/Controllers/InstallerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function mainSettingsSave(Request $request)
$result = $settingManager->saveEnvInfo($request->all());

if ($result['success'])
return redirect()->route('installer.account')->with('success', 'Ustawienia zostały zapisane');
return redirect()->route('installer.account')->with('success', trans('installer::lang.controller.settingsSaved'));
else
return redirect()->back()->with('error', $result['error'])->withInput();
}
Expand Down Expand Up @@ -128,14 +128,14 @@ public function accountSave(Request $request)
$accountManager = new AccountManager();

if ($accountManager->isUserInDb())
return redirect()->back()->with('error', 'Użytkownik w bazie już istnieje');
return redirect()->back()->with('error', trans('installer::lang.controller.alreadyInDb'));

$request->validate($this->configManager->getAccountRules());

if ($accountManager->createAccount($request->all()))
return redirect()->route('installer.finish')->with('success', 'Konto zostało dodane pomyślnie');
return redirect()->route('installer.finish')->with('success', trans('installer::lang.controller.accountCreated'));
else
return redirect()->back()->with('error', 'Błąd przy tworzeniu konta')->withInput();
return redirect()->back()->with('error', trans('installer::lang.controller.errorAccount'))->withInput();
}

/**
Expand Down
9 changes: 7 additions & 2 deletions src/InstallerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,18 @@ public function boot()
{
$this->loadRoutesFrom( __DIR__.'/routes.php');
$this->loadViewsFrom(__DIR__.'/Views/', 'installer');
$this->loadTranslationsFrom(__DIR__.'/Lang/', 'installer');

$this->publishes([
__DIR__.'/Assets/' => public_path('vendor/installer')
], 'public');
], 'laravelInstaller');

$this->publishes([
__DIR__.'/../config/config.php' => base_path('config/installer.php'),
], 'public');
], 'laravelInstaller');

$this->publishes([
__DIR__.'/Lang/' => resource_path('lang/vendor/installer'),
], 'laravelInstaller');
}
}
141 changes: 141 additions & 0 deletions src/Lang/pl/lang.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?php
/**
* @author Tymoteusz `RazorMeister` Bartnik
* @file installer translation
*/

return [
/*
*
* Views/layout/main.blade.php
*
*/
'main' => [
'title' => 'Laravel Instalator',
'headerDesc' => 'Poniżej możesz zainstalować swoją aplikacje.',
'start' => 'Start',
'packages' => 'Pakiety',
'permissions' => 'Permisje',
'settings' => 'Ustawienia',
'account' => 'Konto',
'finish' => 'Koniec',
'error' => 'Error',
'success' => 'Sukces',
'next' => 'Dalej',
'refresh' => 'Odśwież',
'save' => 'Zapisz',
'createAccount' => 'Utwórz konto',
'finish' => 'Zakończ'
],

/*
*
* Views/start.blade.php
*
*/
'start' => [
'header' => 'Start',
'desc' => 'Witaj w kreatorze instalacji Laravel!',
'info' => 'Kliknij poniższy przycisk, aby przystąpić do instalacji!'
],

/*
*
* Views/packages.blade.php
*
*/
'packages' => [
'header' => 'Pakiety',
'desc' => 'Poniżej możesz zobaczyć status potrzebnych pakietów.',
'phpVer' => 'Wersja PHP',
'currentVer' => 'Obecna wersja',
'minVer' => 'Minimalna wersja',
'packetName' => 'Nazwa pakietu',
'status' => 'Status',
],

/*
*
* Views/permissions.blade.php
*
*/
'permissions' => [
'header' => 'Permisje',
'desc' => 'Poniżej możesz zobaczyć czy są nadane odpowiednie permisje.',
'folder' => 'Katalog',
'currentPerms' => 'Obecna prawa',
'minPerms' => 'Wymagane prawa',
],

/*
*
* Views/mainSettings.blade.php
*
*/
'mainSettings' => [
'header' => 'Główne Ustawienia',
'desc' => 'Poniżej skonfiguruj swoją aplikacje.',
],

/*
*
* Views/account.blade.php
*
*/
'account' => [
'header' => 'Konto',
'desc' => 'Poniżej możesz ustawić dane logowania do panelu.',
],

/*
*
* Views/finish.blade.php
*
*/
'finish' => [
'header' => 'Koniec!',
'desc' => 'Instalacja aplikacji dobiegła końca.',
'thanks' => 'Dziękujemy za skorzystanie z Laravel Installatora by RazorMeister.',
'time' => 'Czas Twojej instalacji wyniósł: ',
],

/*
*
* Controllers/InstallerController.php
*
*/
'controller' => [
'settingsSaved' => 'Ustawienia zostały zapisane',
'alreadyInDb' => 'Użytkownik w bazie już istnieje',
'accountCreated' => 'Konto zostało utworzone pomyślnie',
'errorAccount' => 'Błąd przy tworzeniu konta',
],

/*
*
* Middleware/CheckPackages.php
*
*/
'checkPackages' => 'Najpierw sprawdź pakiety',

/*
*
* Middleware/CheckPermissions.php
*
*/
'checkPermissions' => 'Najpierw sprawdź permisje',

/*
*
* Middleware/CheckSettings.php
*
*/
'checkSettings' => 'Najpierw skonfiguruj aplikację',

/*
*
* Middleware/CheckAccount.php
*
*/
'checkAccount' => 'Najpier załóż konto!',
];
2 changes: 1 addition & 1 deletion src/Middleware/CheckAccount.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ public function handle($request, Closure $next)
if ($this->accountManager->isUserInDb())
return $next($request);
else
return redirect(route('installer.account'))->with('error', 'Najpier załóż konto!');
return redirect(route('installer.account'))->with('error', trans('installer::lang.checkAccount'));
}
}
2 changes: 1 addition & 1 deletion src/Middleware/CheckPackages.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ public function handle($request, Closure $next)
if ($phpVerInfo['isOk'] && $packagesInfo['allOk'])
return $next($request);
else
return redirect(route('installer.packages'))->with('error', 'Najpierw sprawdź pakiety');
return redirect(route('installer.packages'))->with('error', trans('installer::lang.checkPackages'));
}
}
2 changes: 1 addition & 1 deletion src/Middleware/CheckPermissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ public function handle($request, Closure $next)
if ($permsInfo['allOk'])
return $next($request);
else
return redirect(route('installer.permissions'))->with('error', 'Najpierw sprawdź permisje');
return redirect(route('installer.permissions'))->with('error', trans('installer::lang.checkPermissions'));
}
}
2 changes: 1 addition & 1 deletion src/Middleware/CheckSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ public function handle($request, Closure $next)
if ($this->settingsManager->envFileExists())
return $next($request);
else
return redirect(route('installer.mainSettings'))->with('error', 'Najpierw skonfiguruj aplikację');
return redirect(route('installer.mainSettings'))->with('error', trans('installer::lang.checkSettings'));
}
}
12 changes: 6 additions & 6 deletions src/Views/account.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
@section('stepNumber', 5)

@section('header')
<h3>Konto</h3>
<p>Poniżej możesz ustawić dane logowania do panelu!</p>
<h3>{{ trans('installer::lang.account.header') }}</h3>
<p>{{ trans('installer::lang.account.desc') }}</p>
@endsection

@section('content')
Expand All @@ -23,11 +23,11 @@
@endforeach
<div class="f1-buttons">
@if($isInDb)
<button type="button" class="btn" disabled><i class="fa fa-check"></i> Utwórz konto</button>
<button type="submit" class="btn btn-next"><i class="fa fa-arrow-right"></i> Next</button>
<button type="button" class="btn" disabled><i class="fa fa-check"></i> {{ trans('installer::lang.main.createAccount') }}</button>
<button type="submit" class="btn btn-next"><i class="fa fa-arrow-right"></i> {{ trans('installer::lang.main.next') }}</button>
@else
<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> Utwórz konto</button>
<button type="button" class="btn" disabled><i class="fa fa-arrow-right"></i> Next</button>
<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> {{ trans('installer::lang.main.createAccount') }}</button>
<button type="button" class="btn" disabled><i class="fa fa-arrow-right"></i> {{ trans('installer::lang.main.next') }}</button>
@endif
</div>
</form>
Expand Down
10 changes: 5 additions & 5 deletions src/Views/finish.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
@section('stepNumber', 6)

@section('header')
<h3>Koniec!</h3>
<p>Instalacja aplikacji dobiegła końca</p>
<h3>{{ trans('installer::lang.finish.header') }}</h3>
<p>{{ trans('installer::lang.finish.desc') }}</p>
@endsection

@section('content')
<form role="form" action="{{ url('/') }}" method="GET">
<hr>
<h4> Dziękujemy za skorzystanie z <strong>Laravel</strong> Installatora by <i>RazorMeister</i></h4>
<h5> Czas Twojej instalacji wyniósł: {{ $time }}</h5>
<h4>{{ trans('installer::lang.finish.thanks') }}</h4>
<h5>{{ trans('installer::lang.finish.time') }} {{ $time }}</h5>
<hr>
<div class="f1-buttons">
<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> Zakończ</button>
<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> {{ trans('installer::lang.main.finish') }}</button>
</div>
</form>
@endsection
Expand Down
22 changes: 10 additions & 12 deletions src/Views/layout/main.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

<!-- Title -->
<title>Laravel Installer</title>
<title>{{ trans('installer::lang.main.title') }}</title>

<!-- CSRF token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
Expand Down Expand Up @@ -67,9 +67,7 @@
<div class="col-sm-8 col-sm-offset-2 text">
<h1><strong>Laravel</strong> Installator</h1>
<div class="description">
<p>
Poniżej możesz zainstalować swoją aplikacje.
</p>
<p>{{ trans('installer::lang.main.headerDesc') }}</p>
</div>
</div>
</div>
Expand All @@ -83,37 +81,37 @@
</div>
<div class="f1-step @if(Request::is('install/start')) active @elseif(Request::is('install/packages') || Request::is('install/permissions') || Request::is('install/mainSettings') || Request::is('install/account') || Request::is('install/finish')) activated @endif">
<div class="f1-step-icon"><i class="fa fa-home"></i></div>
<p>Start</p>
<p>{{ trans('installer::lang.main.start') }}</p>
</div>
<div class="f1-step @if(Request::is('install/packages')) active @elseif(Request::is('install/permissions') || Request::is('install/mainSettings') || Request::is('install/account') || Request::is('install/finish')) activated @endif">
<div class="f1-step-icon"><i class="fa fa-server"></i></div>
<p>Pakiety</p>
<p>{{ trans('installer::lang.main.packages') }}</p>
</div>
<div class="f1-step @if(Request::is('install/permissions')) active @elseif(Request::is('install/mainSettings') || Request::is('install/account') || Request::is('install/finish')) activated @endif">
<div class="f1-step-icon"><i class="fa fa-key"></i></div>
<p>Permisje</p>
<p>{{ trans('installer::lang.main.permissions') }}</p>
</div>
<div class="f1-step @if(Request::is('install/mainSettings')) active @elseif(Request::is('install/account') || Request::is('install/finish')) activated @endif">
<div class="f1-step-icon"><i class="fa fa-cog"></i></div>
<p>Ustawienia</p>
<p>{{ trans('installer::lang.main.settings') }}</p>
</div>
<div class="f1-step @if(Request::is('install/account')) active @elseif(Request::is('install/finish')) activated @endif">
<div class="f1-step-icon"><i class="fa fa-user"></i></div>
<p>Konto</p>
<p>{{ trans('installer::lang.main.account') }}</p>
</div>
<div class="f1-step @if(Request::is('install/finish')) active @endif">
<div class="f1-step-icon"><i class="fa fa-sign-out"></i></div>
<p>Koniec</p>
<p>{{ trans('installer::lang.main.finish') }}</p>
</div>
</div>
@if (session('error'))
<div class="alert alert-danger" role="alert">
<strong> Error </strong>- {{ session('error')}}
<strong>{{ trans('installer::lang.main.error') }}</strong> - {{ session('error')}}
</div>
@endif
@if (session('success'))
<div class="alert alert-success" role="alert">
<strong> Sukces </strong>- {{ session('success')}}
<strong>{{ trans('installer::lang.main.success') }}</strong> - {{ session('success')}}
</div>
@endif

Expand Down
12 changes: 6 additions & 6 deletions src/Views/mainSettings.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
@section('stepNumber', 4)

@section('header')
<h3>Główne ustawienia</h3>
<p>Poniżej skonfiguruj swoją aplikacje.</p>
<h3>{{ trans('installer::lang.mainSettings.header') }}</h3>
<p>{{ trans('installer::lang.mainSettings.desc') }}</p>
@endsection

@section('content')
Expand All @@ -27,11 +27,11 @@
@endforeach
<div class="f1-buttons">
@if($isEnvFile)
<button type="button" class="btn" disabled><i class="fa fa-check"></i> Zapisz</button>
<button type="submit" class="btn btn-next"><i class="fa fa-arrow-right"></i> Next</button>
<button type="button" class="btn" disabled><i class="fa fa-check"></i> {{ trans('installer::lang.main.save') }}</button>
<button type="submit" class="btn btn-next"><i class="fa fa-arrow-right"></i> {{ trans('installer::lang.main.next') }}</button>
@else
<button type="submit" class="btn btn-next"><i class="fa fa-check"></i> Zapisz</button>
<button type="button" class="btn" disabled><i class="fa fa-arrow-right"></i> Next</button>
<button type="submit" class="btn btn-next"><i class="fa fa-check"></i> {{ trans('installer::lang.main.save') }}</button>
<button type="button" class="btn" disabled><i class="fa fa-arrow-right"></i> {{ trans('installer::lang.main.next') }}</button>
@endif
</div>
</form>
Expand Down
Loading

0 comments on commit 7479a3c

Please sign in to comment.