diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 66b0051..89a83ef 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -5,6 +5,7 @@ return [ 'unknown' => 'Unknown', 'male' => 'Male', 'female' => 'Female', + 'family_chart' => 'Family Chart', 'family_tree' => 'Family Tree', 'child_count' => 'Child Count', 'grand_child_count' => 'Grand Child Count', diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php index c57ef99..1d0fd61 100644 --- a/resources/lang/id/app.php +++ b/resources/lang/id/app.php @@ -5,6 +5,7 @@ return [ 'unknown' => 'Tidak diketahui', 'male' => 'Laki-laki', 'female' => 'Perempuan', + 'family_chart' => 'Bagan Keluarga', 'family_tree' => 'Pohon Keluarga', 'child_count' => 'Jumlah Anak', 'grand_child_count' => 'Jumlah Cucu', diff --git a/resources/views/users/chart.blade.php b/resources/views/users/chart.blade.php index bf2c656..2be3ab3 100644 --- a/resources/views/users/chart.blade.php +++ b/resources/views/users/chart.blade.php @@ -5,14 +5,14 @@

@include('users.partials.action-buttons') - {{ $user->name }} Bagan Keluarga + {{ $user->name }} {{ trans('app.family_chart') }}

- + @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@ - +
Kakek & Nenek{{ trans('user.grand_father') }} & {{ trans('user.grand_mother') }} {{ $fatherGrandpa ? $fatherGrandpa->profileLink('chart') : '?' }}
Ayah & Ibu{{ trans('user.father') }} & {{ trans('user.mother') }} {{ $father ? $father->profileLink('chart') : '?' }}
Anak-Anak & Cucu-Cucu{{ trans('user.childs') }} & {{ trans('user.grand_childs') }} @foreach($childs->chunk(4) as $chunkedChild) @@ -69,7 +69,7 @@ @foreach ($siblings->chunk(3) as $chunkedSiblings)
diff --git a/resources/views/users/partials/action-buttons.blade.php b/resources/views/users/partials/action-buttons.blade.php index 133d78f..bd52df3 100644 --- a/resources/views/users/partials/action-buttons.blade.php +++ b/resources/views/users/partials/action-buttons.blade.php @@ -1,8 +1,8 @@
@can ('edit', $user) - {{ link_to_route('users.edit', 'Edit Data', [$user->id], ['class' => 'btn btn-warning']) }} + {{ link_to_route('users.edit', trans('app.edit'), [$user->id], ['class' => 'btn btn-warning']) }} @endcan - {{ link_to_route('users.show', 'Lihat Profil '.$user->name, [$user->id], ['class' => Request::segment(3) == null ? 'btn btn-default active' : 'btn btn-default']) }} - {{ link_to_route('users.chart', 'Lihat Bagan Keluarga', [$user->id], ['class' => Request::segment(3) == 'chart' ? 'btn btn-default active' : 'btn btn-default']) }} - {{ link_to_route('users.tree', 'Lihat Pohon Keluarga', [$user->id], ['class' => Request::segment(3) == 'tree' ? 'btn btn-default active' : 'btn btn-default']) }} + {{ link_to_route('users.show', trans('app.show_profile').' '.$user->name, [$user->id], ['class' => Request::segment(3) == null ? 'btn btn-default active' : 'btn btn-default']) }} + {{ link_to_route('users.chart', trans('app.show_family_chart'), [$user->id], ['class' => Request::segment(3) == 'chart' ? 'btn btn-default active' : 'btn btn-default']) }} + {{ link_to_route('users.tree', trans('app.show_family_tree'), [$user->id], ['class' => Request::segment(3) == 'tree' ? 'btn btn-default active' : 'btn btn-default']) }}
\ No newline at end of file diff --git a/resources/views/users/partials/chart-sibling.blade.php b/resources/views/users/partials/chart-sibling.blade.php index a56594c..4e86e12 100644 --- a/resources/views/users/partials/chart-sibling.blade.php +++ b/resources/views/users/partials/chart-sibling.blade.php @@ -2,11 +2,11 @@ - + - +
Saudara{{ trans('user.siblings') }} {{ $sibling->profileLink('chart') }} ({{ $sibling->gender }})
Keponakan & Cucu-Cucu{{ trans('user.nieces') }} & {{ trans('user.grand_childs') }}
    @foreach($sibling->childs as $child) diff --git a/resources/views/users/show.blade.php b/resources/views/users/show.blade.php index a25c881..1a4d7df 100644 --- a/resources/views/users/show.blade.php +++ b/resources/views/users/show.blade.php @@ -3,7 +3,7 @@ @section('content')

    @include('users.partials.action-buttons', ['user' => $currentUser]) - {{ $currentUser->name }} Profil + {{ $currentUser->name }} {{ trans('app.profile') }}

    diff --git a/resources/views/users/tree.blade.php b/resources/views/users/tree.blade.php index 07c50e8..358ff1e 100644 --- a/resources/views/users/tree.blade.php +++ b/resources/views/users/tree.blade.php @@ -5,7 +5,7 @@

    @include('users.partials.action-buttons') - {{ $user->name }} Pohon Keluarga + {{ $user->name }} {{ trans('app.family_tree') }}

     
    @if ($childsTotal) -
    Jumlah Anak
    +
    {{ trans('app.child_count') }}
    {{ $childsTotal }}
    @endif @if ($grandChildsTotal) -
    Jumlah Cucu
    +
    {{ trans('app.grand_child_count') }}
    {{ $grandChildsTotal }}
    @endif @if ($ggTotal)