tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)

Browse Source 
* Show the local couterpart of emoji when it exists in admin/custom_emojis

* Fix indentation

* Fix error

* Add class table-action-link to Overwrite link

* Make it enable to overwrite emojis

* Make Code Climate happy
This commit is contained in:
nullkal
2017-11-07 22:49:32 +09:00
committed by Eugen Rochko
parent 782224c991
commit b6e2e999bd
6 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/en.yml
View File

@ -134,6 +134,7 @@ en:
listed: Listed
new:
title: Add new custom emoji
overwrite: Overwrite
shortcode: Shortcode
shortcode_hint: At least 2 characters, only alphanumeric characters and underscores
title: Custom emojis