From f540020d1d232b6fce595b258d4bfb74d1e7bf93 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Wed, 25 Jul 2018 08:39:06 +0200
Subject: [PATCH] Add different trigger for the emoji popup of French users.
 (#6140)

---
 app/assets/javascripts/discourse/components/d-editor.js.es6 | 4 ++++
 config/locales/server.en.yml                                | 1 +
 config/site_settings.yml                                    | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index b62b85ed1fa..d3d4c8ba010 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -434,6 +434,10 @@ export default Ember.Component.extend({
           const full = `:${term}`;
           term = term.toLowerCase();
 
+          if (term.length < self.siteSettings.emoji_autocomplete_min_chars) {
+            return resolve([]);
+          }
+
           if (term === "") {
             return resolve(["slight_smile", "smile", "wink", "sunny", "blush"]);
           }
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index e17618f24f1..e428b2a2c32 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1706,6 +1706,7 @@ en:
     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."
+    emoji_autocomplete_min_chars: "Minimum number of characters required to trigger autocomplete emoji popup"
 
     approve_post_count: "The amount of posts from a new or basic user that must be approved"
     approve_unless_trust_level: "Posts for users below this trust level must be approved"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index b3a480dd457..4571cf421cf 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -676,6 +676,11 @@ posting:
     enum: 'EmojiSetSiteSetting'
   enforce_square_emoji:
     default: true
+  emoji_autocomplete_min_chars:
+    client: true
+    default: 0
+    locale_default:
+      fr: 1
   approve_post_count:
     default: 0
   approve_unless_trust_level: