diff --git a/packages/forms/resources/views/components/file-upload.blade.php b/packages/forms/resources/views/components/file-upload.blade.php
index cc0a43dd257..f413e682df1 100644
--- a/packages/forms/resources/views/components/file-upload.blade.php
+++ b/packages/forms/resources/views/components/file-upload.blade.php
@@ -37,10 +37,6 @@
@endpushonce
-@php
- $formComponent->placeholder = __($formComponent->placeholder);
-@endphp
-
acceptedFileTypes) }},
+ acceptedFileTypes: @json($formComponent->acceptedFileTypes),
files: [],
{{ $formComponent->imageCropAspectRatio !== null ? "imageCropAspectRatio: '{$formComponent->imageCropAspectRatio}'," : null }}
{{ $formComponent->imagePreviewHeight !== null ? "imagePreviewHeight: {$formComponent->imagePreviewHeight}," : null }}
{{ $formComponent->imageResizeTargetHeight !== null ? "imageResizeTargetHeight: {$formComponent->imageResizeTargetHeight}," : null }}
{{ $formComponent->imageResizeTargetWidth !== null ? "imageResizeTargetWidth: {$formComponent->imageResizeTargetWidth}," : null }}
- {{ $formComponent->placeholder !== null ? "labelIdle: '{$formComponent->placeholder} KB'," : null }}
+ {{ __($formComponent->placeholder) !== null ? 'labelIdle: \'' . __($formComponent->placeholder) . '\',' : null }}
{{ $formComponent->maxSize !== null ? "maxFileSize: '{$formComponent->maxSize} KB'," : null }}
{{ $formComponent->minSize !== null ? "minFileSize: '{$formComponent->minSize} KB'," : null }}
server: {
diff --git a/src/Resources/Pages/EditRecord.php b/src/Resources/Pages/EditRecord.php
index 4792bc80381..ab697a1015a 100644
--- a/src/Resources/Pages/EditRecord.php
+++ b/src/Resources/Pages/EditRecord.php
@@ -72,7 +72,11 @@ public function isAuthorized()
public function mount($record)
{
- $this->record = static::getModel()::findOrFail($record);
+ $model = static::getModel();
+
+ $routeKeyName = (new $model())->getRouteKeyName();
+
+ $this->record = $model::where($routeKeyName, $record)->firstOrFail();
}
public function save()