Merge branch 'master' of https://github.com/scoumbourdis/grocery-crud

scoumbourdis · Jul 27, 2020 · 606b80a · 606b80a
2 parents 9bf6e33 + dabee5b
commit 606b80a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 43 deletions.
diff --git a/assets/grocery_crud/languages/indonesian.php b/assets/grocery_crud/languages/indonesian.php
@@ -1,47 +1,48 @@
 <?php
 /* Translated by: M. Yuhdi & Ibrahim Yusuf */
-	$lang['list_add'] 				= 'Tambah';
+	$lang['list_add'] 			= 'Tambah';
 	$lang['list_actions'] 			= 'Pilihan';
-	$lang['list_page'] 				= 'Halaman';
+	$lang['list_page'] 			= 'Halaman';
 	$lang['list_paging_of'] 		= 'dari';
 	$lang['list_displaying']		= 'Halaman {start} - {end} dari {results} total';
-	$lang['list_filtered_from']		= '(filtered from {total_results} total entries)';
+	$lang['list_filtered_from']		= '(filtered from {total_results} total masukan data)';
 	$lang['list_show_entries']		= 'Ada {paging} data';
 	$lang['list_no_items']			= 'Tidak ada item';
 	$lang['list_zero_entries']		= 'Ditampilkan 0 - 0 dari 0 item';
 	$lang['list_search'] 			= 'Cari';
 	$lang['list_search_all'] 		= 'Cari Semua';
-	$lang['list_clear_filtering'] 	= 'Hapus Filter';
+	$lang['list_clear_filtering'] 		= 'Hapus Filter';
 	$lang['list_delete'] 			= 'Hapus';
-	$lang['list_edit'] 				= 'Ubah';
-	$lang['list_view'] 				= 'Lihat';
+	$lang['list_edit'] 			= 'Ubah';
+	$lang['list_view'] 			= 'Lihat';
 	$lang['list_paging_first'] 		= 'Awal';
-	$lang['list_paging_previous'] 	= 'Sebelumnya';
+	$lang['list_paging_previous'] 		= 'Sebelumnya';
 	$lang['list_paging_next'] 		= 'Selanjutnya';
 	$lang['list_paging_last'] 		= 'Terakhir';
 	$lang['list_loading'] 			= 'Mohon Tunggu';
 
-	$lang['form_edit'] 				= 'Ubah';
-	$lang['form_view'] 				= 'Lihat';
+	$lang['form_edit'] 			= 'Ubah';
+	$lang['form_view'] 			= 'Lihat';
 	$lang['form_back_to_list'] 		= 'Kembali';
-	$lang['form_update_changes'] 	= 'Simpan Perubahan';
+	$lang['form_update_changes'] 		= 'Simpan Perubahan';
 	$lang['form_cancel'] 			= 'Batal';
-	$lang['form_update_loading'] 	= 'Mohon Tunggu';
-	$lang['update_success_message'] = 'Perubahan telah disimpan.';
-	$lang['form_go_back_to_list'] 	= 'Kembali';
-
-	$lang['form_add'] 				= 'Tambah';
-	$lang['insert_success_message'] = 'Data telah ditambahkan.';
-	$lang['form_or']				= 'atau';
-	$lang['form_save'] 				= 'Simpan';
-	$lang['form_insert_loading'] 	= 'Mohon Tunggu';
-
-	$lang['form_upload_a_file'] 	= 'Unggah berkas';
-	$lang['form_upload_delete'] 	= 'hapus';
+	$lang['form_update_loading'] 		= 'Mohon Tunggu';
+	$lang['update_success_message'] 	= 'Perubahan telah disimpan.';
+	$lang['form_go_back_to_list'] 		= 'Kembali';
+
+	$lang['form_add'] 			= 'Tambah';
+	$lang['insert_success_message'] 	= 'Data telah ditambahkan.';
+	$lang['form_or']			= 'atau';
+	$lang['form_save'] 			= 'Simpan';
+	$lang['form_insert_loading'] 		= 'Mohon Tunggu';
+
+	$lang['form_
+	_a_file'] 		= 'Unggah berkas';
+	$lang['form_upload_delete'] 		= 'hapus';
 	$lang['form_button_clear'] 		= 'Bersihkan';
 
-	$lang['delete_success_message'] = 'Data telah dihapus.';
-	$lang['delete_error_message'] 	= 'Terdapat kesalahan saat menghapus data.';
+	$lang['delete_success_message'] 	= 'Data telah dihapus.';
+	$lang['delete_error_message'] 		= 'Terdapat kesalahan saat menghapus data.';
 
 	/* Javascript messages */
 	$lang['alert_add_form']			= 'Data telah dimasukkan tetapi belum disimpan.\\nApakah anda yakin ingin kembali?';
@@ -52,7 +53,7 @@
 	$lang['update_error']			= 'Terdapat kesalahan saat mengubah data.';
 
 	$lang['crud_previous']			= 'Halaman sebelumnya';
-	$lang['crud_next']				= 'Halaman selanjutnya';
+	$lang['crud_next']			= 'Halaman selanjutnya';
 
 	/* Added in version 1.2.1 */
 	$lang['set_relation_title']		= 'Pilih {field_display_as}';
@@ -61,13 +62,13 @@
 	$lang['form_active']			= 'aktif';
 
 	/* Added in version 1.2.2 */
-	$lang['form_save_and_go_back']	= 'Simpan dan Kembali';
-	$lang['form_update_and_go_back']= 'Simpan dan Kembali';
+	$lang['form_save_and_go_back']		= 'Simpan dan Kembali';
+	$lang['form_update_and_go_back']	= 'Simpan dan Kembali';
 
 	/* Upload functionality */
-	$lang['string_delete_file'] 	= "Menghapus file";
+	$lang['string_delete_file'] 		= "Menghapus file";
 	$lang['string_progress'] 		= "Status: ";
-	$lang['error_on_uploading'] 	= "Terdapat kesalahan pada saat upload.";
+	$lang['error_on_uploading'] 		= "Terdapat kesalahan pada saat mengunggah.";
 	$lang['message_prompt_delete_file'] 	= "Apakah anda yakin ingin menghapus file ini?";
 
 	$lang['error_max_number_of_files'] 	= "Anda hanya dapat mengunggah 1 (satu) file pada satu waktu.";
@@ -76,30 +77,30 @@
 	$lang['error_min_file_size'] 		= "Anda tidak dapat mengunggah file kosong.";
 
 	/* Added in version 1.3.1 */
-	$lang['list_export'] 	= "Ekspor";
-	$lang['list_print'] 	= "Cetak";
-	$lang['minimize_maximize'] = 'Minimize/Maximize';
+	$lang['list_export'] 			= "Ekspor";
+	$lang['list_print'] 			= "Cetak";
+	$lang['minimize_maximize'] 		= 'Memperkecil/Memperbesar';
 	/* Added in version 1.4 */
-	$lang['list_view'] = 'View';
+	$lang['list_view'] 			= 'Lihat';
 
 	/* Added in version 1.5.1 */
-	$lang['ui_day'] = 'dd';
-	$lang['ui_month'] = 'mm';
-	$lang['ui_year'] = 'yyyy';
+	$lang['ui_day'] 			= 'dd';
+	$lang['ui_month'] 			= 'mm';
+	$lang['ui_year'] 			= 'yyyy';
 
 	/* Added in version 1.5.2 */
-	$lang['list_more'] = 'More';
+	$lang['list_more'] 			= 'Lebih';
 
 	/* Added in version 1.5.6 */
-	$lang['list_search_column'] = 'Search {column_name}';
+	$lang['list_search_column'] 		= 'Cari {column_name}';
 
 	/* Added in version 1.5.8 */
-	$lang['alert_delete_multiple'] = 'Are you sure that you want to delete those {items_amount} items?';
+	$lang['alert_delete_multiple'] 		= 'Apakah Anda yakin akan menghapus seluruh {items_amount} data tersebut ?';
 
-	$lang['alert_delete_multiple_one'] = 'Are you sure that you want to delete this 1 item?';
+	$lang['alert_delete_multiple_one'] 	= 'Apakah Anda yakin akan menghapus 1 data ini ?';
 
 
 
 	/* Added in version 1.6.1 */
-	$lang['list_clone'] = 'Clone';
+	$lang['list_clone'] 			= 'Salin';
 
diff --git a/assets/grocery_crud/languages/japanese.php b/assets/grocery_crud/languages/japanese.php
@@ -97,5 +97,5 @@
 
 
 	/* Added in version 1.6.1 */
-	$lang['list_clone'] = 'Clone';
+	$lang['list_clone'] = '複製';
 
diff --git a/assets/grocery_crud/themes/flexigrid/views/list.php b/assets/grocery_crud/themes/flexigrid/views/list.php
@@ -44,7 +44,7 @@
 						<a href='<?php echo $row->edit_url?>' title='<?php echo $this->l('list_edit')?> <?php echo $subject?>' class="edit_button"><span class='edit-icon'></span></a>
 					<?php }?>
                     <?php if(!$unset_clone){?>
-                        <a href='<?php echo $row->clone_url?>' title='Clone <?php echo $subject?>' class="clone_button"><span class='clone-icon'></span></a>
+                        <a href='<?php echo $row->clone_url?>' title='<?php echo $this->l('list_clone')?> <?php echo $subject?>' class="clone_button"><span class='clone-icon'></span></a>
                     <?php }?>
 					<?php if(!$unset_read){?>
 						<a href='<?php echo $row->read_url?>' title='<?php echo $this->l('list_view')?> <?php echo $subject?>' class="edit_button"><span class='read-icon'></span></a>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,5 +97,5 @@


		/* Added in version 1.6.1 */
		$lang['list_clone'] = 'Clone';
		$lang['list_clone'] = '複製';