From 0884b23d917366c75deb72d020368956fbf1ecd4 Mon Sep 17 00:00:00 2001 From: Miguel Urtado Date: Fri, 12 Jan 2024 11:51:20 -0300 Subject: [PATCH 01/12] Add lang pt_BR --- resources/lang/pt_BR/activities.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/lang/pt_BR/activities.php diff --git a/resources/lang/pt_BR/activities.php b/resources/lang/pt_BR/activities.php new file mode 100644 index 0000000..96fdc75 --- /dev/null +++ b/resources/lang/pt_BR/activities.php @@ -0,0 +1,25 @@ + 'Histórico', + + 'title' => 'Histórico :record', + + 'default_datetime_format' => 'd-m-Y, H:i:s', + + 'table' => [ + 'field' => 'Campo', + 'old' => 'Antes', + 'new' => 'Depois', + 'restore' => 'Restaurado', + ], + + 'events' => [ + 'updated' => 'Atualizado', + 'created' => 'Criado', + 'deleted' => 'Excluído', + 'restored' => 'Restaurado', + 'restore_successful' => 'Restaurado com sucesso', + 'restore_failed' => 'Falha na restauração', + ], +]; From 6ff6032d7fd19ae0bd95da9936c8bb4f41e40a83 Mon Sep 17 00:00:00 2001 From: Miguel Urtado Date: Mon, 15 Jan 2024 16:35:49 -0300 Subject: [PATCH 02/12] Update lang pt_BR --- resources/lang/pt_BR/activities.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/activities.php b/resources/lang/pt_BR/activities.php index 96fdc75..fa048ab 100644 --- a/resources/lang/pt_BR/activities.php +++ b/resources/lang/pt_BR/activities.php @@ -5,7 +5,7 @@ 'title' => 'Histórico :record', - 'default_datetime_format' => 'd-m-Y, H:i:s', + 'default_datetime_format' => 'd/m/Y H:i:s', 'table' => [ 'field' => 'Campo', From 40f1e0b39df5cd8ab5e0d8d11cc073ef475a0c39 Mon Sep 17 00:00:00 2001 From: "Rawand J. Rasool" <73317192+RawanD201@users.noreply.github.com> Date: Thu, 7 Mar 2024 16:13:38 +0300 Subject: [PATCH 03/12] Add ckb translation --- resources/lang/ckb/activities.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/lang/ckb/activities.php diff --git a/resources/lang/ckb/activities.php b/resources/lang/ckb/activities.php new file mode 100644 index 0000000..3af97f0 --- /dev/null +++ b/resources/lang/ckb/activities.php @@ -0,0 +1,25 @@ + 'نرخی پێشوو', + + 'title' => 'نرخەکانی پێشووی :record', + + 'default_datetime_format' => 'Y-m-d, H:i:s', + + 'table' => [ + 'field' => 'خانە', + 'old' => 'کۆن', + 'new' => 'نوێ', + ], + + 'events' => [ + 'updated' => 'نوێکراوەتەوە', + 'Created' => 'دروستکراوە', + 'deleted' => 'سڕایەوە', + 'restored' => 'گەڕاندنەوە', + 'restore_successful' => 'بە سەرکەوتوویی گەڕێنرایەوە', + 'restore_failed' => 'گەڕاندنەوە شکستی هێنا', + ], +]; From 0262aba6c122bd8472ceab36f44f75a1261712e5 Mon Sep 17 00:00:00 2001 From: Simon Broekaert Date: Wed, 13 Mar 2024 21:30:57 +0100 Subject: [PATCH 04/12] Add dutch (nl) translations --- resources/lang/nl/activities.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/lang/nl/activities.php diff --git a/resources/lang/nl/activities.php b/resources/lang/nl/activities.php new file mode 100644 index 0000000..8793bef --- /dev/null +++ b/resources/lang/nl/activities.php @@ -0,0 +1,25 @@ + 'Geschiedenis', + + 'title' => 'Geschiedenis :record', + + 'default_datetime_format' => 'Y-m-d, H:i:s', + + 'table' => [ + 'field' => 'Veld', + 'old' => 'Oud', + 'new' => 'Nieuw', + 'restore' => 'Herstellen', + ], + + 'events' => [ + 'updated' => 'Bewerkt', + 'created' => 'Aangemaakt', + 'deleted' => 'Verwijderd', + 'restored' => 'Hersteld', + 'restore_successful' => 'Succesvol hersteld', + 'restore_failed' => 'Herstellen mislukt', + ], +]; From 5635296b93d30bdf328215751a24e125891cc6ad Mon Sep 17 00:00:00 2001 From: pxlrbt Date: Fri, 15 Mar 2024 13:14:36 +0000 Subject: [PATCH 05/12] Apply style changes --- resources/lang/ckb/activities.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/ckb/activities.php b/resources/lang/ckb/activities.php index 3af97f0..9b2a8e5 100644 --- a/resources/lang/ckb/activities.php +++ b/resources/lang/ckb/activities.php @@ -7,13 +7,13 @@ 'title' => 'نرخەکانی پێشووی :record', 'default_datetime_format' => 'Y-m-d, H:i:s', - + 'table' => [ 'field' => 'خانە', 'old' => 'کۆن', 'new' => 'نوێ', ], - + 'events' => [ 'updated' => 'نوێکراوەتەوە', 'Created' => 'دروستکراوە', From 07d1d33d3e7a314b9693849ea9fc4ae478bbab1f Mon Sep 17 00:00:00 2001 From: zhanglei Date: Mon, 1 Apr 2024 16:49:18 +0800 Subject: [PATCH 06/12] Long text needs to be wrapped, such as url --- resources/views/pages/list-activities.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php index e20fcd4..8033015 100644 --- a/resources/views/pages/list-activities.blade.php +++ b/resources/views/pages/list-activities.blade.php @@ -63,14 +63,14 @@ class="right" {{ $this->getFieldLabel($field) }} - + @if(is_array($oldValue)) 
{{ json_encode($oldValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}
@else {{ $oldValue }} @endif - + @if(is_array($newValue)) 
{{ json_encode($newValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}
@else From 0107d447fa7f644e6b9c55bf0ef9790d2bfd53ea Mon Sep 17 00:00:00 2001 From: Niek Brekelmans Date: Wed, 3 Apr 2024 21:50:16 +0200 Subject: [PATCH 07/12] extract the restore authorization --- resources/views/pages/list-activities.blade.php | 2 +- src/Pages/ListActivities.php | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php index 8033015..38b54a9 100644 --- a/resources/views/pages/list-activities.blade.php +++ b/resources/views/pages/list-activities.blade.php @@ -22,7 +22,7 @@
- @if (static::getResource()::canRestore($record)) + @if ($this->canRestoreActivity()) record); + } + public function restoreActivity(int|string $key) { - if (! static::getResource()::canRestore($this->record)) { + if (! $this->canRestoreActivity()) { abort(403); } From 2084ac87256336448a0032b404b5e6f9887acb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Vit=C3=A1sek?= Date: Fri, 26 Apr 2024 13:33:04 +0000 Subject: [PATCH 08/12] Added Czech translations --- resources/lang/cs/activities.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 resources/lang/cs/activities.php diff --git a/resources/lang/cs/activities.php b/resources/lang/cs/activities.php new file mode 100644 index 0000000..c28b077 --- /dev/null +++ b/resources/lang/cs/activities.php @@ -0,0 +1,25 @@ + 'Log', + + 'title' => 'Log entity ":record"', + + 'default_datetime_format' => 'j.n.Y H:i:s', + + 'table' => [ + 'field' => 'Pole', + 'old' => 'Původní', + 'new' => 'Nové', + 'restore' => 'Obnovit', + ], + + 'events' => [ + 'updated' => 'Upraveno', + 'created' => 'Vytvořeno', + 'deleted' => 'Smazáno', + 'restored' => 'Obnoveno', + 'restore_successful' => 'Úspěšně obnoveno', + 'restore_failed' => 'Obnovení selhalo', + ], +]; From 5bc72c6914cd2f33d4d9eb944456bc016c7017fb Mon Sep 17 00:00:00 2001 From: Marc-Antoine Favreau <8480549+Heyian@users.noreply.github.com> Date: Sun, 16 Jun 2024 15:33:25 -0400 Subject: [PATCH 09/12] Added French translations --- resources/lang/fr/activities.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 resources/lang/fr/activities.php diff --git a/resources/lang/fr/activities.php b/resources/lang/fr/activities.php new file mode 100755 index 0000000..022dca2 --- /dev/null +++ b/resources/lang/fr/activities.php @@ -0,0 +1,25 @@ + 'Historique', + + 'title' => 'Historique :record', + + 'default_datetime_format' => 'Y-m-d, H:i:s', + + 'table' => [ + 'field' => 'Champ', + 'old' => 'Ancien', + 'new' => 'Nouveau', + 'restore' => 'Restaurer', + ], + + 'events' => [ + 'updated' => 'Mis à jour', + 'created' => 'Créé', + 'deleted' => 'Effacé', + 'restored' => 'Restauré', + 'restore_successful' => 'Restauré avec succès', + 'restore_failed' => 'Échec de la restauration', + ], +]; From e27a3397ebc747ad97ce4c42104f57ae3fdde353 Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Mon, 1 Jul 2024 10:15:26 +0100 Subject: [PATCH 10/12] Ensure we have fields for rendering restore and table. --- resources/views/pages/list-activities.blade.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php index 38b54a9..dacc0e6 100644 --- a/resources/views/pages/list-activities.blade.php +++ b/resources/views/pages/list-activities.blade.php @@ -4,6 +4,13 @@
@foreach($this->getActivities() as $activityItem) + + @php + /* @var \Spatie\Activitylog\Models\Activity $activityItem */ + $changes = $activityItem->getChangesAttribute(); + $changesCount = $changes->count(); + @endphp +
- @if ($this->canRestoreActivity()) + @if ($this->canRestoreActivity() && $changesCount > 0)
+ @if($changesCount > 0)) + @@ -80,6 +89,7 @@ class="right" @endforeach + @endif
@endforeach From 74192c3a71cc34126bd89325c7acadb6dc167c3f Mon Sep 17 00:00:00 2001 From: Tony Partridge Date: Mon, 1 Jul 2024 10:21:30 +0100 Subject: [PATCH 11/12] Update list-activities.blade.php --- resources/views/pages/list-activities.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php index dacc0e6..df3d84e 100644 --- a/resources/views/pages/list-activities.blade.php +++ b/resources/views/pages/list-activities.blade.php @@ -45,7 +45,7 @@ class="right"
- @if($changesCount > 0)) + @if($changesCount > 0) From 1e0a006114d886a945141a3c13a00d969cafacaf Mon Sep 17 00:00:00 2001 From: Dennis Koch Date: Mon, 1 Jul 2024 09:36:53 +0000 Subject: [PATCH 12/12] code-style --- .../views/pages/list-activities.blade.php | 81 +++++++++---------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php index df3d84e..946db49 100644 --- a/resources/views/pages/list-activities.blade.php +++ b/resources/views/pages/list-activities.blade.php @@ -46,49 +46,48 @@ class="right" @if($changesCount > 0) - - - - - @lang('filament-activity-log::activities.table.field') - - - @lang('filament-activity-log::activities.table.old') - - - @lang('filament-activity-log::activities.table.new') - - - @php - /* @var \Spatie\Activitylog\Models\Activity $activityItem */ - $changes = $activityItem->getChangesAttribute(); - @endphp - @foreach(data_get($changes, 'attributes', []) as $field => $change) + + + + @lang('filament-activity-log::activities.table.field') + + + @lang('filament-activity-log::activities.table.old') + + + @lang('filament-activity-log::activities.table.new') + + @php - $oldValue = data_get($changes, "old.{$field}"); - $newValue = data_get($changes, "attributes.{$field}"); + /* @var \Spatie\Activitylog\Models\Activity $activityItem */ + $changes = $activityItem->getChangesAttribute(); @endphp - $loop->even])> - - {{ $this->getFieldLabel($field) }} - - - @if(is_array($oldValue)) - 
{{ json_encode($oldValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}
- @else - {{ $oldValue }} - @endif - - - @if(is_array($newValue)) - 
{{ json_encode($newValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}
- @else - {{ $newValue }} - @endif - - - @endforeach - + @foreach(data_get($changes, 'attributes', []) as $field => $change) + @php + $oldValue = data_get($changes, "old.{$field}"); + $newValue = data_get($changes, "attributes.{$field}"); + @endphp + $loop->even])> + + {{ $this->getFieldLabel($field) }} + + + @if(is_array($oldValue)) + 
{{ json_encode($oldValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}
+ @else + {{ $oldValue }} + @endif + + + @if(is_array($newValue)) + 
{{ json_encode($newValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}
+ @else + {{ $newValue }} + @endif + + + @endforeach + @endif @endforeach