Skip to content

Commit

Permalink
REVERT: removes translate_emoji (#9889)
Browse files Browse the repository at this point in the history
This API is actually used in some plugins.
  • Loading branch information
jjaffeux committed May 27, 2020
1 parent 1cf2d1f commit 1d685c2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/models/emoji.rb
Expand Up @@ -126,7 +126,7 @@ def self.load_custom
end

def self.load_translations
db["translations"]
db["translations"].merge(Plugin::CustomEmoji.translations)
end

def self.base_directory
Expand Down
13 changes: 13 additions & 0 deletions lib/plugin/instance.rb
Expand Up @@ -30,6 +30,15 @@ def self.register(name, url, group = Emoji::DEFAULT_GROUP)
def self.unregister(name, group = Emoji::DEFAULT_GROUP)
emojis[group].delete(name)
end

def self.translations
@@translations ||= {}
end

def self.translate(from, to)
@@cache_key = Digest::SHA1.hexdigest(cache_key + from)[0..10]
translations[from] = to
end
end

class Plugin::Instance
Expand Down Expand Up @@ -487,6 +496,10 @@ def register_emoji(name, url, group = Emoji::DEFAULT_GROUP)
Emoji.clear_cache
end

def translate_emoji(from, to)
Plugin::CustomEmoji.translate(from, to)
end

def automatic_assets
css = styles.join("\n")
js = javascripts.join("\n")
Expand Down

0 comments on commit 1d685c2

Please sign in to comment.