From 23ca0ce58a87fe3d103d63183d9bb722ed71b530 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 27 Aug 2017 12:01:04 +0800 Subject: [PATCH] Added lang switcher on top nav Save lang selection to session with middlware Restructure navbar on app layout to nav partial --- app/Http/Kernel.php | 1 + app/Http/Middleware/Lang.php | 24 ++++++++++ resources/lang/en/app.php | 5 +++ resources/lang/id/app.php | 5 +++ resources/views/layouts/app.blade.php | 62 +++----------------------- resources/views/layouts/partials/nav.blade.php | 59 ++++++++++++++++++++++++ resources/views/users/search.blade.php | 18 ++++---- 7 files changed, 110 insertions(+), 64 deletions(-) create mode 100644 app/Http/Middleware/Lang.php create mode 100644 resources/views/layouts/partials/nav.blade.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 66d34c3..41fa18a 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -34,6 +34,7 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, + \App\Http\Middleware\Lang::class, ], 'api' => [ diff --git a/app/Http/Middleware/Lang.php b/app/Http/Middleware/Lang.php new file mode 100644 index 0000000..ae715f4 --- /dev/null +++ b/app/Http/Middleware/Lang.php @@ -0,0 +1,24 @@ +setLocale(request('lang', session('lang'))); + if (request('lang')) { + session(['lang' => request('lang')]); + } + return $next($request); + } +} diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index c4924e5..bf62dd2 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -2,6 +2,8 @@ return [ // Labels + 'my_profile' => 'My Profile', + 'search' => 'Search', 'unknown' => 'Unknown', 'male' => 'Male', 'female' => 'Female', @@ -9,6 +11,9 @@ return [ 'family_tree' => 'Family Tree', 'child_count' => 'Child Count', 'grand_child_count' => 'Grand Child Count', + 'user_found' => ':total found with keyword : :keyword', + 'search_your_family' => 'Search Your Family', + 'search_your_family_placeholder' => 'Enter name/nickname... click Search', // Actions 'edit' => 'Edit', diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php index 8cd661a..3ac20ea 100644 --- a/resources/lang/id/app.php +++ b/resources/lang/id/app.php @@ -2,6 +2,8 @@ return [ // Labels + 'my_profile' => 'Profil Saya', + 'search' => 'Cari', 'unknown' => 'Tidak diketahui', 'male' => 'Laki-laki', 'female' => 'Perempuan', @@ -9,6 +11,9 @@ return [ 'family_tree' => 'Pohon Keluarga', 'child_count' => 'Jumlah Anak', 'grand_child_count' => 'Jumlah Cucu', + 'user_found' => 'User ditemukan : :total Orang untuk kata kunci : :keyword', + 'search_your_family' => 'Cari Keluarga Anda', + 'search_your_family_placeholder' => 'Masukkan nama/panggilan... klik Cari', // Actions 'edit' => 'Edit', diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cbdd2b2..796764e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -21,63 +21,15 @@
- + @include('layouts.partials.nav')
+ {{-- {{ dump(get_class_methods(url())) }} --}} + {{-- {{ url()->current().'?lang=en' }} --}} + {{-- {{ dump(get_class_methods(Route::current())) }} --}} + {{-- {{ dump(Route::current()->parameters()) }} --}} + {{-- {{ dump(url(Route::getName(), ['query' => 'recent', 'order' => 'desc'])) }} --}} + {{-- {{ dump(Route::current()->setParameter('lang', 'id')) }} --}} @yield('content')
diff --git a/resources/views/layouts/partials/nav.blade.php b/resources/views/layouts/partials/nav.blade.php new file mode 100644 index 0000000..06bca3a --- /dev/null +++ b/resources/views/layouts/partials/nav.blade.php @@ -0,0 +1,59 @@ + \ No newline at end of file diff --git a/resources/views/users/search.blade.php b/resources/views/users/search.blade.php index 61228de..ef512de 100644 --- a/resources/views/users/search.blade.php +++ b/resources/views/users/search.blade.php @@ -2,18 +2,18 @@ @section('content')

- Cari Keluarga Anda + {{ trans('app.search_your_family') }} @if (request('q')) - User ditemukan : {{ $users->total() }} Orang untuk kata kunci : {{ request('q') }} + {!! trans('app.user_found', ['total' => $users->total(), 'keyword' => request('q')]) !!} @endif

{{ Form::open(['method' => 'get','class' => '']) }}
- {{ Form::text('q', request('q'), ['class' => 'form-control', 'placeholder' => 'Masukkan nama/panggilan... klik Cari']) }} + {{ Form::text('q', request('q'), ['class' => 'form-control', 'placeholder' => trans('app.search_your_family_placeholder')]) }} - {{ Form::submit('Cari', ['class' => 'btn btn-default']) }} + {{ Form::submit(trans('app.search'), ['class' => 'btn btn-default']) }} {{ link_to_route('users.search', 'Reset', [], ['class' => 'btn btn-default']) }}
@@ -29,14 +29,14 @@

{{ $user->profileLink() }} ({{ $user->gender }})

-
Panggilan : {{ $user->nickname }}
+
{{ trans('user.nickname') }} : {{ $user->nickname }}
-
Ayah : {{ $user->father_id ? $user->father->name : '' }}
-
Ibu : {{ $user->mother_id ? $user->mother->name : '' }}
+
{{ trans('user.fahter') }} : {{ $user->father_id ? $user->father->name : '' }}
+
{{ trans('user.mother') }} : {{ $user->mother_id ? $user->mother->name : '' }}
- {{ link_to_route('users.show', 'Lihat Profil', [$user->id], ['class' => 'btn btn-default btn-xs']) }} - {{ link_to_route('users.chart', 'Bagan Keluarga', [$user->id], ['class' => 'btn btn-default btn-xs']) }} + {{ link_to_route('users.show', trans('app.show_profile'), [$user->id], ['class' => 'btn btn-default btn-xs']) }} + {{ link_to_route('users.chart', trans('app.show_family_chart'), [$user->id], ['class' => 'btn btn-default btn-xs']) }}