diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php index 89a83ef..c4924e5 100644 --- a/resources/lang/en/app.php +++ b/resources/lang/en/app.php @@ -15,4 +15,8 @@ return [ 'show_profile' => 'Show Profile', 'show_family_chart' => 'Show Family Chart', 'show_family_tree' => 'Show Family Tree', + 'enter_new_name' => 'Enter new Name...', + 'select_from_existing_males' => 'Select from Existing Males', + 'select_from_existing_females' => 'Select from Existing Females', + 'select_from_existing_couples' => 'Select from Existing Couples', ]; \ No newline at end of file diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index 20d2772..d9772d1 100644 --- a/resources/lang/en/user.php +++ b/resources/lang/en/user.php @@ -25,6 +25,7 @@ return [ 'add_wife' => 'Add Wife', 'add_husband' => 'Add Husband', 'add_child' => 'Add Child', + 'add_child_from_existing_couples' => 'Parent (select spouse of :name)', // Attributes 'name' => 'Name', diff --git a/resources/lang/id/app.php b/resources/lang/id/app.php index 1d0fd61..8cd661a 100644 --- a/resources/lang/id/app.php +++ b/resources/lang/id/app.php @@ -15,4 +15,8 @@ return [ 'show_profile' => 'Lihat Profil', 'show_family_chart' => 'Lihat Bagan Keluarga', 'show_family_tree' => 'Lihat Pohon Keluarga', + 'enter_new_name' => 'Input Nama Baru...', + 'select_from_existing_males' => 'Pilih dari Pria terdaftar', + 'select_from_existing_females' => 'Pilih dari Wanita terdaftar', + 'select_from_existing_couples' => 'Pilih Pasangan Pernikahan', ]; \ No newline at end of file diff --git a/resources/lang/id/user.php b/resources/lang/id/user.php index 5f81129..2a5acaf 100644 --- a/resources/lang/id/user.php +++ b/resources/lang/id/user.php @@ -25,6 +25,7 @@ return [ 'add_wife' => 'Tambah Isteri', 'add_husband' => 'Tambah Suami', 'add_child' => 'Tambah Anak', + 'add_child_from_existing_couples' => 'Dari Pernikahan (pilih pasangan :name)', // Attributes 'name' => 'Nama', diff --git a/resources/views/users/partials/childs.blade.php b/resources/views/users/partials/childs.blade.php index 1d080be..6bae26e 100644 --- a/resources/views/users/partials/childs.blade.php +++ b/resources/views/users/partials/childs.blade.php @@ -2,10 +2,10 @@
| Ayah | +{{ trans('user.father') }} |
@can ('edit', $currentUser)
@if (request('action') == 'set_father')
{{ Form::open(['route' => ['family-actions.set-father', $user->id]]) }}
- {!! FormField::select('set_father_id', $malePersonList, ['label' => false, 'value' => $user->father_id, 'placeholder' => 'Pilih dari Laki-laki Terdaftar']) !!}
+ {!! FormField::select('set_father_id', $malePersonList, ['label' => false, 'value' => $user->father_id, 'placeholder' => trans('app.select_from_existing_males')]) !!}
- {{ Form::text('set_father', null, ['class' => 'form-control input-sm', 'placeholder' => 'Input Nama Baru...']) }}
+ {{ Form::text('set_father', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
{{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_father_button']) }}
{{ link_to_route('users.show', 'Batal', [$user->id], ['class' => 'btn btn-default btn-sm']) }}
@@ -30,14 +30,14 @@
|
||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Ibu | +{{ trans('user.mother') }} |
@can ('edit', $currentUser)
@if (request('action') == 'set_mother')
{{ Form::open(['route' => ['family-actions.set-mother', $user->id]]) }}
- {!! FormField::select('set_mother_id', $femalePersonList, ['label' => false, 'value' => $user->mother_id, 'placeholder' => 'Pilih dari Wanita Terdaftar']) !!}
+ {!! FormField::select('set_mother_id', $femalePersonList, ['label' => false, 'value' => $user->mother_id, 'placeholder' => trans('app.select_from_existing_females')]) !!}
- {{ Form::text('set_mother', null, ['class' => 'form-control input-sm', 'placeholder' => 'Input Nama Baru...']) }}
+ {{ Form::text('set_mother', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
{{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_mother_button']) }}
{{ link_to_route('users.show', 'Batal', [$user->id], ['class' => 'btn btn-default btn-sm']) }}
@@ -56,7 +56,7 @@
|
||||||||||||||||||||||||
| Orang Tua | +{{ trans('user.parent') }} | @can ('edit', $currentUser) @@ -76,7 +76,7 @@ @can('edit', $currentUser) @if (request('action') == 'set_parent') {{ Form::open(['route' => ['family-actions.set-parent', $user->id]]) }} - {!! FormField::select('set_parent_id', $allMariageList, ['label' => false, 'value' => $user->parent_id, 'placeholder' => 'Pilih Pasangan Pernikahan']) !!} + {!! FormField::select('set_parent_id', $allMariageList, ['label' => false, 'value' => $user->parent_id, 'placeholder' => trans('app.select_from_existing_couples')]) !!} {{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_parent_button']) }} {{ Form::close() }} @endif @@ -85,7 +85,7 @@ | ||||||||||||||||||||||||
| Isteri | +{{ trans('user.wife') }} |
@can ('edit', $currentUser)
@@ -108,9 +108,9 @@
@if (request('action') == 'add_spouse')
{{ Form::open(['route' => ['family-actions.add-wife', $user->id]]) }}
- {!! FormField::select('set_wife_id', $femalePersonList, ['label' => false, 'placeholder' => 'Pilih dari Wanita Terdaftar']) !!}
+ {!! FormField::select('set_wife_id', $femalePersonList, ['label' => false, 'placeholder' => trans('app.select_from_existing_females')]) !!}
- {{ Form::text('set_wife', null, ['class' => 'form-control input-sm', 'placeholder' => 'Input Nama Baru...']) }}
+ {{ Form::text('set_wife', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
{{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_wife_button']) }}
@@ -123,7 +123,7 @@
| ||||||||||||||||||||||||
| Suami | +{{ trans('user.husband') }} |
@can ('edit', $currentUser)
@@ -145,9 +145,9 @@
@if (request('action') == 'add_spouse')
{{ Form::open(['route' => ['family-actions.add-husband', $user->id]]) }}
- {!! FormField::select('set_husband_id', $malePersonList, ['label' => false, 'placeholder' => 'Pilih dari Laki-Laki Terdaftar']) !!}
+ {!! FormField::select('set_husband_id', $malePersonList, ['label' => false, 'placeholder' => trans('app.select_from_existing_males')]) !!}
- {{ Form::text('set_husband', null, ['class' => 'form-control input-sm', 'placeholder' => 'Input Nama Baru...']) }}
+ {{ Form::text('set_husband', null, ['class' => 'form-control input-sm', 'placeholder' => trans('app.enter_new_name')]) }}
{{ Form::submit('update', ['class' => 'btn btn-info btn-sm', 'id' => 'set_husband_button']) }}
diff --git a/resources/views/users/partials/profile.blade.php b/resources/views/users/partials/profile.blade.php
index 9e9a61b..ee21293 100644
--- a/resources/views/users/partials/profile.blade.php
+++ b/resources/views/users/partials/profile.blade.php
@@ -1,43 +1,43 @@
- Profil{{ trans('user.profile') }}
|