From f33cff21cf41ed060783e1eaad6c1c4838216ed2 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 25 Jan 2016 10:22:12 -0300 Subject: PLT-7: Refactoring models to use translations (chunk 6) - Add spanish translations --- model/file_info.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'model/file_info.go') diff --git a/model/file_info.go b/model/file_info.go index 741b4e55d..131baff6d 100644 --- a/model/file_info.go +++ b/model/file_info.go @@ -36,7 +36,7 @@ func GetInfoForBytes(filename string, data []byte) (*FileInfo, *AppError) { if mimeType == "image/gif" { // just show the gif itself instead of a preview image for animated gifs if gifImage, err := gif.DecodeAll(bytes.NewReader(data)); err != nil { - return nil, NewAppError("GetInfoForBytes", "Could not decode gif.", "filename="+filename) + return nil, NewLocAppError("GetInfoForBytes", "model.file_info.get.gif.app_error", nil, "filename="+filename) } else { hasPreviewImage = len(gifImage.Image) == 1 } -- cgit v1.2.3-1-g7c22 From 1cd25cf3806f6ceb2e47a3bc791569cedd0acf1d Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 25 Jan 2016 09:43:40 -0500 Subject: Fixed serverside errors occurring when getting files with no extension --- model/file_info.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'model/file_info.go') diff --git a/model/file_info.go b/model/file_info.go index 131baff6d..f785042b3 100644 --- a/model/file_info.go +++ b/model/file_info.go @@ -32,6 +32,11 @@ func GetInfoForBytes(filename string, data []byte) (*FileInfo, *AppError) { mimeType = mime.TypeByExtension(extension) } + if extension != "" && extension[0] == '.' { + // the client expects a file extension without the leading period + extension = extension[1:] + } + hasPreviewImage := isImage if mimeType == "image/gif" { // just show the gif itself instead of a preview image for animated gifs @@ -45,7 +50,7 @@ func GetInfoForBytes(filename string, data []byte) (*FileInfo, *AppError) { return &FileInfo{ Filename: filename, Size: size, - Extension: extension[1:], + Extension: extension, MimeType: mimeType, HasPreviewImage: hasPreviewImage, }, nil -- cgit v1.2.3-1-g7c22