Skip to content

Commit

Permalink
Merge branch '5.x' into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
luanfreitasdev authored Aug 8, 2024
2 parents ff69ccc + ea16460 commit 2ec7f0c
Show file tree
Hide file tree
Showing 50 changed files with 362 additions and 148 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ 8.2, 8.1 ]
laravel: [ 11.*, 10.* ]
php: [ 8.2 ]
laravel: [ 11.* ]
exclude:
- php: 8.1
laravel: 11.*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
php: [ 8.2 ]
laravel: [ 11.*, 10.* ]
laravel: [ 11.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}
Expand Down
66 changes: 0 additions & 66 deletions .github/workflows/typesense.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ PowerGrid offers a range of features that are readily available:
| Queue Export for large datasets ||
| Responsive ||
| Livewire Modal Integration (Wire Elements Modal) ||
| Multi Language | Available in 🇺🇸 🇧🇷 🇪🇸 🇮🇹 🇩🇪 and more... |
| Multi Language | Available in 🇺🇸 🇧🇷 🇪🇸 🇮🇹 🇩🇪 and [more...](https://github.com/Power-Components/livewire-powergrid/tree/5.x/resources/lang) |

`📚` Learn more in our [Documentation](https://livewire-powergrid.com).

Expand Down
2 changes: 1 addition & 1 deletion dist/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/powergrid.js": "/powergrid.js?id=8dbd9927fb1c6a57be1f269d484ae3c8",
"/powergrid.js": "/powergrid.js?id=e337ca9de7dd9197a219302abbb7fce0",
"/bootstrap5.css": "/bootstrap5.css?id=ebd9853ab6704f4a2335e83a4310bb2b",
"/tailwind.css": "/tailwind.css?id=714a88b9d3bc600e84388f451014ac82",
"/tom-select.css": "/tom-select.css?id=7af730d2c4bf937316d4002948b1571d",
Expand Down
2 changes: 1 addition & 1 deletion dist/powergrid.js

Large diffs are not rendered by default.

21 changes: 0 additions & 21 deletions phpunit.typesense.xml

This file was deleted.

6 changes: 3 additions & 3 deletions resources/js/stores/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ document.addEventListener('alpine:init', () => {
this.selected[tableName] = []
}

if(!this.selected[tableName].includes(parseFloat(value))) {
this.selected[tableName].push(parseFloat(value))
if(!this.selected[tableName].includes(value)) {
this.selected[tableName].push(value)

return;
}

this.remove(parseFloat(value), tableName)
this.remove(value, tableName)
},
remove(value, tableName) {
const index = this.selected[tableName].indexOf(value);
Expand Down
11 changes: 11 additions & 0 deletions resources/lang/ar/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,15 @@
'with_trashed' => 'مع المحذوف',
'only_trashed' => 'فقط محذوف',
],
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/ca/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
11 changes: 11 additions & 0 deletions resources/lang/cs/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,15 @@
'with_trashed' => 'Se smazanými',
'only_trashed' => 'Pouze smazané',
],
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/de/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Multiple Suche ist aktiv',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/en/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/es/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
22 changes: 15 additions & 7 deletions resources/lang/fa/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
return [
'buttons' => [
'filter' => 'فیلتر',
'clear_all_filters' => 'Clear all',
'clear_all_filters' => 'حذف همه',
],
'labels' => [
'action' => 'اقدام ها',
Expand Down Expand Up @@ -55,13 +55,21 @@
'completed' => 'صادرات به پایان رسید! فایل های شما آماده بارگیری هستند',
],
'soft_deletes' => [
'message_with_trashed' => 'Displaying all records, including deleted ones.',
'message_only_trashed' => 'Displaying only deleted records.',
'without_trashed' => 'Without deleted',
'with_trashed' => 'With deleted',
'only_trashed' => 'Only deleted',
'message_with_trashed' => 'نمایش همه سطرها همراه با حذف شده ها.',
'message_only_trashed' => 'نمایش حذف شده ها.',
'without_trashed' => 'بدون حذف شده ها',
'with_trashed' => 'همراه حذف شده ها',
'only_trashed' => 'فقط حذف شده ها',
],
'multi_sort' => [
'message' => 'Multiple sort is active',
'message' => 'سطح چند مدله فعال شد',
],
'buttons_macros' => [
'confirm' => [
'message' => 'آیا از انجام این اقدام اطمینان دارید؟',
],
'confirm_prompt' => [
'message' => "آیا از انجام این کار اطمینان دارید؟\n\n برای تایید :confirmValue را وارد کنید.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/fr/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/id/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Pengurutan ganda diaktifkan',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/it/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/ms_MY/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/nl/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Meervoudige sortering is actief',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/pl/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Wielokolumnowe sortowanie jest aktywne',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/pt_BR/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'A classificação múltipla está ativa',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/ru/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,12 @@
'multi_sort' => [
'message' => 'Multiple sort is active',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/tr/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,12 @@
'multi_sort' => [
'message' => 'Çoklu sıralama etkin',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
8 changes: 8 additions & 0 deletions resources/lang/uk/datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,12 @@
'multi_sort' => [
'message' => 'Сортувати за',
],
'buttons_macros' => [
'confirm' => [
'message' => 'Are you sure you want to perform this action?',
],
'confirm_prompt' => [
'message' => "Are you sure you want to perform this action? \n\n Enter :confirmValue to confirm.",
],
],
];
Loading

0 comments on commit 2ec7f0c

Please sign in to comment.