Skip to content

Commit 85b2f85

Browse files
committed
Merge branch 'develop' into 8.0
2 parents d102538 + c00a3ea commit 85b2f85

13 files changed

+139
-29
lines changed

locale/id/auth.php

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
|--------------------------------------------------------------------------
7+
| Authentication Language Lines
8+
|--------------------------------------------------------------------------
9+
|
10+
| The following language lines are used during authentication for various
11+
| messages that we need to display to the user. You are free to modify
12+
| these language lines according to your application's requirements.
13+
|
14+
*/
15+
16+
'failed' => 'Kredensial ini tidak cocok dengan catatan kami.',
17+
'throttle' => 'Terlalu banyak upaya login. Silakan coba lagi dalam :detik detik.',
18+
19+
'full_name' => 'Nama lengkap',
20+
'email' => 'Surel',
21+
'password' => 'Kata sandi',
22+
'confirm_password' => 'setujui password',
23+
'remember_me' => 'Ingat saya',
24+
'sign_in' => 'Masuk',
25+
'sign_out' => 'Keluar',
26+
'register' => 'Daftar',
27+
28+
'login' => [
29+
'title' => 'Masuk untuk memulai sesi Anda',
30+
'forgot_password' => 'Saya lupa kata sandi saya',
31+
'register_membership' => 'Daftarkan keanggotaan baru',
32+
],
33+
34+
'registration' => [
35+
'title' => 'Daftarkan keanggotaan baru',
36+
'i_agree' => 'saya setuju untuk',
37+
'terms' => 'syarat-syaratnya',
38+
'have_membership' => 'Saya sudah memiliki keanggotaan',
39+
],
40+
41+
'forgot_password' => [
42+
'title' => 'Masukkan Email untuk mengatur ulang kata sandi',
43+
'send_pwd_reset' => 'Kirim Tautan Atur Ulang Kata Sandi',
44+
],
45+
46+
'reset_password' => [
47+
'title' => 'Mereset password Anda',
48+
'reset_pwd_btn' => 'Setel Ulang Kata Sandi',
49+
],
50+
51+
'confirm_passwords' => [
52+
'title' => 'Harap konfirmasi kata sandi Anda sebelum melanjutkan.',
53+
'forgot_your_password' => 'Lupa kata sandi Anda?',
54+
],
55+
56+
'verify_email' => [
57+
'title' => 'Verifikasi alamat email Anda',
58+
'success' => 'Tautan verifikasi baru telah dikirim ke alamat email Anda',
59+
'notice' => 'Sebelum melanjutkan, periksa email Anda untuk tautan verifikasi. Jika Anda tidak menerima email,',
60+
'another_req' => 'klik di sini untuk meminta yang lain',
61+
],
62+
63+
'emails' => [
64+
'password' => [
65+
'reset_link' => 'Klik di sini untuk mengatur ulang kata sandi Anda',
66+
],
67+
],
68+
69+
'app' => [
70+
'member_since' => 'Anggota Sejak',
71+
'messages' => 'Pesan',
72+
'settings' => 'Pengaturan',
73+
'lock_account' => 'Kunci Akun',
74+
'profile' => 'Profil',
75+
'online' => 'On line',
76+
'search' => 'Mencari',
77+
'create' => 'Membuat',
78+
'export' => 'Ekspor',
79+
'print' => 'Mencetak',
80+
'reset' => 'Mengatur ulang',
81+
'reload' => 'Muat ulang',
82+
],
83+
];

locale/id/crud.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return [
4+
'add_new' => 'Tambah baru',
5+
'cancel' => 'Membatalkan',
6+
'save' => 'Menyimpan',
7+
'edit' => 'Sunting',
8+
'detail' => 'Detail',
9+
'back' => 'Kembali',
10+
'action' => 'Tindakan',
11+
'id' => 'Indo',
12+
'created_at' => 'Dibuat di',
13+
'updated_at' => 'Diperbarui Pada',
14+
'deleted_at' => 'Dihapus At',
15+
'are_you_sure' => 'Apa kamu yakin?',
16+
];

locale/id/messages.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
return [
4+
'retrieved' => ':model berhasil diambil.',
5+
'saved' => ':model berhasil disimpan.',
6+
'updated' => ':model berhasil diperbarui.',
7+
'deleted' => ':model berhasil dihapus.',
8+
'not_found' => ':model tidak ditemukan',
9+
];

templates/scaffold/controller/controller.stub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use Response;
1212

1313
class $MODEL_NAME$Controller extends AppBaseController
1414
{
15-
/** @var $MODEL_NAME$Repository */
15+
/** @var $MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repository*/
1616
private $$MODEL_NAME_CAMEL$Repository;
1717

1818
public function __construct($MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repo)

templates/scaffold/controller/controller_locale.stub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use Response;
1212

1313
class $MODEL_NAME$Controller extends AppBaseController
1414
{
15-
/** @var $MODEL_NAME$Repository */
15+
/** @var $MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repository*/
1616
private $$MODEL_NAME_CAMEL$Repository;
1717

1818
public function __construct($MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repo)

templates/scaffold/controller/datatable_controller.stub

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Response;
1313

1414
class $MODEL_NAME$Controller extends AppBaseController
1515
{
16-
/** @var $MODEL_NAME$Repository */
16+
/** @var $MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repository*/
1717
private $$MODEL_NAME_CAMEL$Repository;
1818

1919
public function __construct($MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repo)
@@ -25,6 +25,7 @@ class $MODEL_NAME$Controller extends AppBaseController
2525
* Display a listing of the $MODEL_NAME$.
2626
*
2727
* @param $MODEL_NAME$DataTable $$MODEL_NAME_CAMEL$DataTable
28+
*
2829
* @return Response
2930
*/
3031
public function index($MODEL_NAME$DataTable $$MODEL_NAME_CAMEL$DataTable)
@@ -63,7 +64,7 @@ class $MODEL_NAME$Controller extends AppBaseController
6364
/**
6465
* Display the specified $MODEL_NAME$.
6566
*
66-
* @param int $id
67+
* @param int $id
6768
*
6869
* @return Response
6970
*/
@@ -83,7 +84,7 @@ class $MODEL_NAME$Controller extends AppBaseController
8384
/**
8485
* Show the form for editing the specified $MODEL_NAME$.
8586
*
86-
* @param int $id
87+
* @param int $id
8788
*
8889
* @return Response
8990
*/
@@ -103,7 +104,7 @@ class $MODEL_NAME$Controller extends AppBaseController
103104
/**
104105
* Update the specified $MODEL_NAME$ in storage.
105106
*
106-
* @param int $id
107+
* @param int $id
107108
* @param Update$MODEL_NAME$Request $request
108109
*
109110
* @return Response
@@ -128,7 +129,7 @@ class $MODEL_NAME$Controller extends AppBaseController
128129
/**
129130
* Remove the specified $MODEL_NAME$ from storage.
130131
*
131-
* @param int $id
132+
* @param int $id
132133
*
133134
* @return Response
134135
*/

templates/scaffold/controller/datatable_controller_locale.stub

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Response;
1313

1414
class $MODEL_NAME$Controller extends AppBaseController
1515
{
16-
/** @var $MODEL_NAME$Repository */
16+
/** @var $MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repository*/
1717
private $$MODEL_NAME_CAMEL$Repository;
1818

1919
public function __construct($MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repo)
@@ -25,6 +25,7 @@ class $MODEL_NAME$Controller extends AppBaseController
2525
* Display a listing of the $MODEL_NAME$.
2626
*
2727
* @param $MODEL_NAME$DataTable $$MODEL_NAME_CAMEL$DataTable
28+
*
2829
* @return Response
2930
*/
3031
public function index($MODEL_NAME$DataTable $$MODEL_NAME_CAMEL$DataTable)
@@ -63,7 +64,7 @@ class $MODEL_NAME$Controller extends AppBaseController
6364
/**
6465
* Display the specified $MODEL_NAME$.
6566
*
66-
* @param int $id
67+
* @param int $id
6768
*
6869
* @return Response
6970
*/
@@ -83,7 +84,7 @@ class $MODEL_NAME$Controller extends AppBaseController
8384
/**
8485
* Show the form for editing the specified $MODEL_NAME$.
8586
*
86-
* @param int $id
87+
* @param int $id
8788
*
8889
* @return Response
8990
*/
@@ -103,7 +104,7 @@ class $MODEL_NAME$Controller extends AppBaseController
103104
/**
104105
* Update the specified $MODEL_NAME$ in storage.
105106
*
106-
* @param int $id
107+
* @param int $id
107108
* @param Update$MODEL_NAME$Request $request
108109
*
109110
* @return Response
@@ -128,7 +129,7 @@ class $MODEL_NAME$Controller extends AppBaseController
128129
/**
129130
* Remove the specified $MODEL_NAME$ from storage.
130131
*
131-
* @param int $id
132+
* @param int $id
132133
*
133134
* @return Response
134135
*/

templates/scaffold/controller/jquery_datatable_controller.stub

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use Datatables;
1515

1616
class $MODEL_NAME$Controller extends AppBaseController
1717
{
18-
/** @var $MODEL_NAME$Repository */
18+
/** @var $MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repository*/
1919
private $$MODEL_NAME_CAMEL$Repository;
2020

2121
public function __construct($MODEL_NAME$Repository $$MODEL_NAME_CAMEL$Repo)
@@ -27,6 +27,7 @@ class $MODEL_NAME$Controller extends AppBaseController
2727
* Display a listing of the $MODEL_NAME$.
2828
*
2929
* @param Request $request
30+
*
3031
* @return Response
3132
*/
3233
public function index(Request $request)
@@ -69,7 +70,7 @@ class $MODEL_NAME$Controller extends AppBaseController
6970
/**
7071
* Display the specified $MODEL_NAME$.
7172
*
72-
* @param int $id
73+
* @param int $id
7374
*
7475
* @return Response
7576
*/
@@ -89,7 +90,7 @@ class $MODEL_NAME$Controller extends AppBaseController
8990
/**
9091
* Show the form for editing the specified $MODEL_NAME$.
9192
*
92-
* @param int $id
93+
* @param int $id
9394
*
9495
* @return Response
9596
*/
@@ -109,7 +110,7 @@ class $MODEL_NAME$Controller extends AppBaseController
109110
/**
110111
* Update the specified $MODEL_NAME$ in storage.
111112
*
112-
* @param int $id
113+
* @param int $id
113114
* @param Update$MODEL_NAME$Request $request
114115
*
115116
* @return Response
@@ -134,7 +135,7 @@ class $MODEL_NAME$Controller extends AppBaseController
134135
/**
135136
* Remove the specified $MODEL_NAME$ from storage.
136137
*
137-
* @param int $id
138+
* @param int $id
138139
*
139140
* @return Response
140141
*/

templates/scaffold/controller/model_datatable_controller.stub

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class $MODEL_NAME$Controller extends AppBaseController
5656
/**
5757
* Display the specified $MODEL_NAME$.
5858
*
59-
* @param int $id
59+
* @param int $id
6060
*
6161
* @return Response
6262
*/
@@ -77,7 +77,7 @@ class $MODEL_NAME$Controller extends AppBaseController
7777
/**
7878
* Show the form for editing the specified $MODEL_NAME$.
7979
*
80-
* @param int $id
80+
* @param int $id
8181
*
8282
* @return Response
8383
*/
@@ -98,7 +98,7 @@ class $MODEL_NAME$Controller extends AppBaseController
9898
/**
9999
* Update the specified $MODEL_NAME$ in storage.
100100
*
101-
* @param int $id
101+
* @param int $id
102102
* @param Update$MODEL_NAME$Request $request
103103
*
104104
* @return Response
@@ -125,7 +125,7 @@ class $MODEL_NAME$Controller extends AppBaseController
125125
/**
126126
* Remove the specified $MODEL_NAME$ from storage.
127127
*
128-
* @param int $id
128+
* @param int $id
129129
*
130130
* @throws \Exception
131131
*

templates/scaffold/controller/model_datatable_controller_locale.stub

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class $MODEL_NAME$Controller extends AppBaseController
1717
* Display a listing of the $MODEL_NAME$.
1818
*
1919
* @param $MODEL_NAME$DataTable $$MODEL_NAME_CAMEL$DataTable
20+
*
2021
* @return Response
2122
*/
2223
public function index($MODEL_NAME$DataTable $$MODEL_NAME_CAMEL$DataTable)
@@ -56,7 +57,7 @@ class $MODEL_NAME$Controller extends AppBaseController
5657
/**
5758
* Display the specified $MODEL_NAME$.
5859
*
59-
* @param int $id
60+
* @param int $id
6061
*
6162
* @return Response
6263
*/
@@ -77,7 +78,7 @@ class $MODEL_NAME$Controller extends AppBaseController
7778
/**
7879
* Show the form for editing the specified $MODEL_NAME$.
7980
*
80-
* @param int $id
81+
* @param int $id
8182
*
8283
* @return Response
8384
*/
@@ -98,7 +99,7 @@ class $MODEL_NAME$Controller extends AppBaseController
9899
/**
99100
* Update the specified $MODEL_NAME$ in storage.
100101
*
101-
* @param int $id
102+
* @param int $id
102103
* @param Update$MODEL_NAME$Request $request
103104
*
104105
* @return Response
@@ -125,7 +126,7 @@ class $MODEL_NAME$Controller extends AppBaseController
125126
/**
126127
* Remove the specified $MODEL_NAME$ from storage.
127128
*
128-
* @param int $id
129+
* @param int $id
129130
*
130131
* @throws \Exception
131132
*

0 commit comments

Comments
 (0)