From a0cc913b85dea5023b705697afa5cd8749a6e5de Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 14 Jun 2016 09:38:19 -0400 Subject: PLT-3143 Added serverside code for custom Emoji (#3311) * Added model objects for emoji * Added database tables for emoji * Added settings for custom emoji * Added serverside APIs and unit tests for custom emoji * Added additional validation to catch duplicate emoji names earlier on * Added additional validation to prevent users from adding emoji as another user --- webapp/i18n/en.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 85f221c7c..b1ab4964f 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -125,6 +125,13 @@ "admin.connectionSecurityTitle": "Connection Security:", "admin.connectionSecurityTls": "TLS", "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.", + "admin.customization.customEmoji": "Custom Emoji", + "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in chat messages.", + "admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:", + "admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji", + "admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.", + "admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow system admins to create custom emoji", + "admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:", "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service Terms of Service and Privacy Policy.", "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", "admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ", @@ -422,6 +429,7 @@ "admin.sidebar.configuration": "Configuration", "admin.sidebar.connections": "Connections", "admin.sidebar.customBrand": "Custom Branding", + "admin.sidebar.customEmoji": "Custom Emoji", "admin.sidebar.customization": "Customization", "admin.sidebar.database": "Database", "admin.sidebar.developer": "Developer", -- cgit v1.2.3-1-g7c22