Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add different trigger for the emoji popup of French users. (#6140)

This commit is contained in:
Dan Ungureanu 2018-07-25 08:39:06 +02:00 committed by Sam
parent 417bcf7d2e
commit f540020d1d
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -434,6 +434,10 @@ export default Ember.Component.extend({
const full = `:${term}`; const full = `:${term}`;
term = term.toLowerCase(); term = term.toLowerCase();
if (term.length < self.siteSettings.emoji_autocomplete_min_chars) {
return resolve([]);
}
if (term === "") { if (term === "") {
return resolve(["slight_smile", "smile", "wink", "sunny", "blush"]); return resolve(["slight_smile", "smile", "wink", "sunny", "blush"]);
} }

1
config/locales/server.en.yml
View File

@ -1706,6 +1706,7 @@ en:
enable_emoji_shortcuts: "Common smiley text such as :) :p :( will be converted to emojis" enable_emoji_shortcuts: "Common smiley text such as :) :p :( will be converted to emojis"
emoji_set: "How would you like your emoji?" emoji_set: "How would you like your emoji?"
enforce_square_emoji: "Force a square aspect ratio to all emojis." 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_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" approve_unless_trust_level: "Posts for users below this trust level must be approved"

5
config/site_settings.yml
View File

@ -676,6 +676,11 @@ posting:
enum: 'EmojiSetSiteSetting' enum: 'EmojiSetSiteSetting'
enforce_square_emoji: enforce_square_emoji:
default: true default: true
emoji_autocomplete_min_chars:
client: true
default: 0
locale_default:
fr: 1
approve_post_count: approve_post_count:
default: 0 default: 0
approve_unless_trust_level: approve_unless_trust_level: