IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: allows to have custom emoji translation without static file (#9893)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-05-27 20:11:52 +02:00
committed by GitHub
parent 207b72ade1
commit 77801aa9be
11 changed files with 94 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/emoji.rb
View File

@@ -126,7 +126,7 @@ class Emoji
end
def self.load_translations
db["translations"].merge(Plugin::CustomEmoji.translations)
db["translations"]
end
def self.base_directory