summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorIraquitan Cordeiro Filho <iraquitanfilho@gmail.com>2016-11-21 23:00:13 -0300
committerenahum <nahumhbl@gmail.com>2016-11-21 23:00:13 -0300
commit48d64f3f68bc861eda3732457b5d24d238cacc53 (patch)
tree0f710ba1787dc60f4f20748b4d783bee47aa2211 /webapp
parent9b7e2e50e3fd0a8b81a3cddc0f7240b894778c65 (diff)
downloadchat-48d64f3f68bc861eda3732457b5d24d238cacc53.tar.gz
chat-48d64f3f68bc861eda3732457b5d24d238cacc53.tar.bz2
chat-48d64f3f68bc861eda3732457b5d24d238cacc53.zip
PLT-4277: Allow larger custom emojis by resizing (#4447)
Add function to resize image using resize.Thumbnail. Add function to resize gif using previous function. Add function to convert image.Image to image.Palleted. Add logic to identify image type and resize them if they are larger than MaxEmojiHeight or MaxEmojiWidth. Also increase MaxEmojiFileSize. * fix: Add github.com/nfnt to vendor * fix: Fix max file size and if logic in resizeEmoji * test: Fix and add new tests for new resize feature * fix: Fix and update translations to fit new feature * fix: Add requested changes
Diffstat (limited to 'webapp')
-rw-r--r--webapp/i18n/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a56774ffa..942b611aa 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -73,7 +73,7 @@
"add_emoji.header": "Add",
"add_emoji.image": "Image",
"add_emoji.image.button": "Select",
- "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 64 KB and dimensions up to 128 by 128 pixels.",
+ "add_emoji.image.help": "Choose the image for your emoji. The image can be a gif, png, or jpeg file with a max size of 1 MB. Dimensions will automatically resize to fit 128 by 128 pixels but keeping aspect ratio.",
"add_emoji.imageRequired": "An image is required for the emoji",
"add_emoji.name": "Name",
"add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",