Merge branch 'bug/image-upload' of git://github.com/Abijeet/BookStack into Abijeet-bug/image-upload

This commit is contained in:
Dan Brown
2018-03-24 14:39:57 +00:00
10 changed files with 48 additions and 27 deletions

View File

@ -21,6 +21,7 @@ return [
'image_upload_success' => 'Image uploaded successfully',
'image_update_success' => 'Image details successfully updated',
'image_delete_success' => 'Image successfully deleted',
'image_upload_remove' => 'Remove',
/**
* Code editor
@ -29,4 +30,4 @@ return [
'code_language' => 'Code Language',
'code_content' => 'Code Content',
'code_save' => 'Save Code',
];
];

View File

@ -35,6 +35,7 @@ return [
'cannot_get_image_from_url' => 'Cannot get image from :url',
'cannot_create_thumbs' => 'The server cannot create thumbnails. Please check you have the GD PHP extension installed.',
'server_upload_limit' => 'The server does not allow uploads of this size. Please try a smaller file size.',
'uploaded' => 'The server does not allow uploads of this size. Please try a smaller file size.',
'image_upload_error' => 'An error occurred uploading the image',
'image_upload_type_error' => 'The image type being uploaded is invalid',
@ -78,4 +79,4 @@ return [
'error_occurred' => 'An Error Occurred',
'app_down' => ':appName is down right now',
'back_soon' => 'It will be back up soon.',
];
];