2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 09:10:25 +08:00

FEATURE: allow site operators to disable emoji shortcuts

This commit is contained in:
Sam 2018-01-24 12:21:44 +11:00
parent 7ba06de0d6
commit 3492a91056
4 changed files with 27 additions and 3 deletions

View file

@ -1524,6 +1524,7 @@ en:
slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
enable_emoji: "Enable emoji"
enable_emoji_shortcuts: "Common smiley text such as :) :p :( will be converted to emojis"
emoji_set: "How would you like your emoji?"
enforce_square_emoji: "Force a square aspect ratio to all emojis."

View file

@ -601,6 +601,9 @@ posting:
enable_emoji:
default: true
client: true
enable_emoji_shortcuts:
default: true
client: true
emoji_set:
default: 'twitter'
client: true