summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-05 11:58:18 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-07-05 11:58:18 -0400
commitdc2f2a800105b77e665ec2a00c6290f35b1a2ba3 (patch)
tree82f23c2e72a7c785f55c2d6c1c35c10c16994918 /webapp/i18n
parenta65f1fc266f15eaa8f79541d4d11440c3d356bb6 (diff)
downloadchat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.tar.gz
chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.tar.bz2
chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.zip
PLT-3145 Custom Emojis (#3381)
* Reorganized Backstage code to use a view controller and separated it from integrations code * Renamed InstalledIntegrations component to BackstageList * Added EmojiList page * Added AddEmoji page * Added custom emoji to autocomplete and text formatter * Moved system emoji to EmojiStore * Stopped trying to get emoji before logging in * Rerender posts when emojis change * Fixed submit handler on backstage pages to properly support enter * Removed debugging code * Updated javascript driver * Fixed unit tests * Fixed backstage routes * Added clientside validation to prevent users from creating an emoji with the same name as a system one * Fixed AddEmoji page to properly redirect when an emoji is created successfully * Fixed updating emoji list when an emoji is deleted * Added type prop to BackstageList to properly support using a table for the list * Added help text to EmojiList * Fixed backstage on smaller screen sizes * Disable custom emoji by default * Improved restrictions on creating emojis * Fixed non-admin users seeing the option to delete each other's emojis * Fixing gofmt * Fixed emoji unit tests * Fixed trying to get emoji from the server when it's disabled
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json35
1 files changed, 33 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 574ea6ecc..afe32ae0e 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -64,6 +64,20 @@
"add_command.username": "Response Username",
"add_command.username.help": "Choose a username override for responses for this slash command. Usernames can consist of up to 22 characters consisting of lowercase letters, numbers and they symbols \"-\", \"_\", and \".\" .",
"add_command.username.placeholder": "Username",
+ "add_emoji.cancel": "Cancel",
+ "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.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 '_'.",
+ "add_emoji.nameRequired": "A name is required for the emoji",
+ "add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
+ "add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
+ "add_emoji.preview": "Preview",
+ "add_emoji.preview.sentence": "This is a sentence with {image} in it.",
+ "add_emoji.save": "Save",
"add_incoming_webhook.cancel": "Cancel",
"add_incoming_webhook.channel": "Channel",
"add_incoming_webhook.channelRequired": "A valid channel is required",
@@ -137,6 +151,7 @@
"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.restrictCustomEmojiCreationAdmin": "Allow system and team admins to create custom emoji",
"admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow system admins to create custom emoji",
"admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:",
"admin.customization.support": "Legal and Support",
@@ -701,6 +716,7 @@
"authorize.app": "The app <strong>{appName}</strong> would like the ability to access and modify your basic information.",
"authorize.deny": "Deny",
"authorize.title": "An application would like to connect to your {teamName} account",
+ "backstage_list.search": "Search",
"backstage_navbar.backToMattermost": "Back to {siteName}",
"backstage_sidebar.integrations": "Integrations",
"backstage_sidebar.integrations.commands": "Slash Commands",
@@ -858,6 +874,9 @@
"create_team.team_url.teamUrl": "Team URL",
"create_team.team_url.unavailable": "This URL is unavailable. Please try another.",
"create_team.team_url.webAddress": "Choose the web address of your new team:",
+ "custom_emoji.empty": "No custom emoji found",
+ "custom_emoji.header": "Custom Emoji",
+ "custom_emoji.search": "Search Custom Emoji",
"delete_channel.cancel": "Cancel",
"delete_channel.channel": "channel",
"delete_channel.confirm": "Confirm DELETE Channel",
@@ -901,6 +920,15 @@
"email_verify.verified": "{siteName} Email Verified",
"email_verify.verifiedBody": "<p>Your email has been verified! Click <a href={url}>here</a> to log in.</p>",
"email_verify.verifyFailed": "Failed to verify your email.",
+ "emoji_list.actions": "Actions",
+ "emoji_list.add": "Add Custom Emoji",
+ "emoji_list.creator": "Creator",
+ "emoji_list.delete": "Delete",
+ "emoji_list.empty": "No Custom Emoji Found",
+ "emoji_list.image": "Image",
+ "emoji_list.name": "Name",
+ "emoji_list.search": "Search Custom Emoji",
+ "emoji_list.somebody": "Somebody on another team",
"error.not_found.link_message": "Back to Mattermost",
"error.not_found.message": "The page you were trying to reach does not exist",
"error.not_found.title": "Page not found",
@@ -960,23 +988,25 @@
"installed_commands.add": "Add Slash Command",
"installed_commands.empty": "No commands found",
"installed_commands.header": "Slash Commands",
+ "installed_commands.search": "Search Slash Commands",
+ "installed_commands.unnamed_command": "Unnamed Slash Command",
"installed_incoming_webhooks.add": "Add Incoming Webhook",
"installed_incoming_webhooks.empty": "No incoming webhooks found",
"installed_incoming_webhooks.header": "Incoming Webhooks",
+ "installed_incoming_webhooks.search": "Search Incoming Webhooks",
"installed_incoming_webhooks.unknown_channel": "A Private Webhook",
- "installed_integraions.unnamed_command": "Unnamed Slash Command",
"installed_integrations.callback_urls": "Callback URLs: {urls}",
"installed_integrations.content_type": "Content-Type: {contentType}",
"installed_integrations.creation": "Created by {creator} on {createAt, date, full}",
"installed_integrations.delete": "Delete",
"installed_integrations.regenToken": "Regenerate Token",
- "installed_integrations.search": "Search Integrations",
"installed_integrations.token": "Token: {token}",
"installed_integrations.triggerWords": "Trigger Words: {triggerWords}",
"installed_integrations.url": "URL: {url}",
"installed_outgoing_webhooks.add": "Add Outgoing Webhook",
"installed_outgoing_webhooks.empty": "No outgoing webhooks found",
"installed_outgoing_webhooks.header": "Outgoing Webhooks",
+ "installed_outgoing_webhooks.search": "Search Outgoing Webhooks",
"installed_outgoing_webhooks.unknown_channel": "A Private Webhook",
"integrations.command.description": "Slash commands send events to external integrations",
"integrations.command.title": "Slash Command",
@@ -1091,6 +1121,7 @@
"navbar_dropdown.accountSettings": "Account Settings",
"navbar_dropdown.console": "System Console",
"navbar_dropdown.create": "Create a New Team",
+ "navbar_dropdown.emoji": "Custom Emoji",
"navbar_dropdown.help": "Help",
"navbar_dropdown.integrations": "Integrations",
"navbar_dropdown.inviteMember": "Invite New Member",